summaryrefslogtreecommitdiff
path: root/src/text.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-01-11 02:12:47 +0000
committerJared Adams <jaxad0127@gmail.com>2010-01-11 02:12:47 +0000
commit440150cba3cd8441283d9914fc444358dee64495 (patch)
tree89ff0bb6b5229748861ba5364268e3c465a3b3a0 /src/text.cpp
parentada99b0ff2395e4d0853016306564f471bfc1bc8 (diff)
downloadmana-440150cba3cd8441283d9914fc444358dee64495.tar.gz
mana-440150cba3cd8441283d9914fc444358dee64495.tar.bz2
mana-440150cba3cd8441283d9914fc444358dee64495.tar.xz
mana-440150cba3cd8441283d9914fc444358dee64495.zip
Cleanup GUI classes
Moved remaining widgets into widgets folder, standardized include order, moved TextRenderer out.
Diffstat (limited to 'src/text.cpp')
-rw-r--r--src/text.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/text.cpp b/src/text.cpp
index 2cd1e29a..1f03ebd2 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -26,12 +26,13 @@
#include "configuration.h"
#include "textmanager.h"
-#include "resources/resourcemanager.h"
-#include "resources/image.h"
+#include "textrenderer.h"
#include "gui/gui.h"
#include "gui/palette.h"
-#include "gui/textrenderer.h"
+
+#include "resources/resourcemanager.h"
+#include "resources/image.h"
int Text::mInstances = 0;
ImageRect Text::mBubble;