diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-07 23:47:57 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-07 23:52:46 +0200 |
| commit | d69d85f06fa6dc22ac4c7789e4140e32d119a7f1 (patch) | |
| tree | 1d2311bfdba616136d0ac26f8cbe9ab73c88f0e4 /src/gui/gui.cpp | |
| parent | 303c1f69761e90b83d4809e911f7785ec66b46aa (diff) | |
| download | mana-d69d85f06fa6dc22ac4c7789e4140e32d119a7f1.tar.gz mana-d69d85f06fa6dc22ac4c7789e4140e32d119a7f1.tar.bz2 mana-d69d85f06fa6dc22ac4c7789e4140e32d119a7f1.tar.xz mana-d69d85f06fa6dc22ac4c7789e4140e32d119a7f1.zip | |
Moved basic widgets into the gui/widgets directory
In an attempt to make the GUI code a little more structured, basic
widgets are now put in gui/widgets. Many includes were also cleaned up.
Diffstat (limited to 'src/gui/gui.cpp')
| -rw-r--r-- | src/gui/gui.cpp | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 87ce74fa..2c75a9f1 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -19,29 +19,30 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "gui/gui.h" + +#include "gui/focushandler.h" +#include "gui/palette.h" +#include "gui/sdlinput.h" +#include "gui/skin.h" +#include "gui/truetypefont.h" +#include "gui/viewport.h" + +#include "gui/widgets/window.h" +#include "gui/widgets/windowcontainer.h" + +#include "configlistener.h" +#include "configuration.h" +#include "graphics.h" +#include "log.h" + +#include "resources/image.h" +#include "resources/imageset.h" +#include "resources/imageloader.h" +#include "resources/resourcemanager.h" + #include <guichan/exception.hpp> #include <guichan/image.hpp> -#include <guichan/imagefont.hpp> - -#include "focushandler.h" -#include "gui.h" -#include "palette.h" -#include "sdlinput.h" -#include "skin.h" -#include "truetypefont.h" -#include "viewport.h" -#include "window.h" -#include "windowcontainer.h" - -#include "../configlistener.h" -#include "../configuration.h" -#include "../graphics.h" -#include "../log.h" - -#include "../resources/image.h" -#include "../resources/imageset.h" -#include "../resources/imageloader.h" -#include "../resources/resourcemanager.h" // Guichan stuff Gui *gui = 0; |