diff options
| author | erihel <erihel@gmail.com> | 2012-09-11 12:49:41 +0200 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2012-09-11 12:49:41 +0200 |
| commit | 01cc0fbc49696a19a56dfdd8359d4bb77e868925 (patch) | |
| tree | 81d0674e4b54e95dad5508948491a26d9d5522da /src/ui/displaytext.cpp | |
| parent | 5903e400d476c2cf62c146643a0693c4fc29d68a (diff) | |
| download | colobot-01cc0fbc49696a19a56dfdd8359d4bb77e868925.tar.gz colobot-01cc0fbc49696a19a56dfdd8359d4bb77e868925.tar.bz2 colobot-01cc0fbc49696a19a56dfdd8359d4bb77e868925.zip | |
* latest changes
* all files except studio, map and maindialog should compile
* did some code cleanup
Diffstat (limited to 'src/ui/displaytext.cpp')
| -rw-r--r-- | src/ui/displaytext.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp index 1e26f7f..aa51653 100644 --- a/src/ui/displaytext.cpp +++ b/src/ui/displaytext.cpp @@ -18,29 +18,26 @@ // displaytext.cpp -//#include <windows.h> -//#include <stdio.h> -//#include <d3d.h> +#include "displaytext.h" + +#include "interface.h" +#include "button.h" +#include "label.h" +#include "window.h" +#include "group.h" -//#include "common/struct.h" -//#include "old/d3dengine.h" -#include "graphics/engine/engine.h" #include "common/event.h" +#include "common/iman.h" #include "common/misc.h" #include "common/restext.h" -#include "common/iman.h" + +#include "graphics/engine/engine.h" + #include "object/object.h" #include "object/motion/motion.h" #include "object/motion/motiontoto.h" -#include "ui/interface.h" -#include "ui/button.h" -#include "ui/label.h" -#include "ui/window.h" -#include "ui/group.h" -//#include "old/text.h" -//#include "old/sound.h" -//#include "sound/sound.h" -#include "ui/displaytext.h" + + namespace Ui { |