diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-09-20 22:17:21 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-06 22:40:36 +0100 |
| commit | cf0b8753dadbcc6484b859a21544e437ef7d33eb (patch) | |
| tree | 5fb4e649754140bf15917a33be4510e66c4c1c8c /src/gui/gui.cpp | |
| parent | 6f08807edfa6719b73795a0630ba0affd4f9a7dc (diff) | |
| download | mana-client-cf0b8753dadbcc6484b859a21544e437ef7d33eb.tar.gz mana-client-cf0b8753dadbcc6484b859a21544e437ef7d33eb.tar.bz2 mana-client-cf0b8753dadbcc6484b859a21544e437ef7d33eb.tar.xz mana-client-cf0b8753dadbcc6484b859a21544e437ef7d33eb.zip | |
Added support for unicode charset in textfields and chat.
Conflicts:
src/Makefile.am
src/game.cpp
src/gui/browserbox.cpp
src/gui/gui.cpp
src/gui/textfield.cpp
src/main.cpp
(cherry picked from mainline commit 7b67e852086ad3ccd98a622f890b245ab6a0a321)
Diffstat (limited to 'src/gui/gui.cpp')
| -rw-r--r-- | src/gui/gui.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 61da1a0c..f7f582fb 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -26,10 +26,8 @@ #include <guichan/imagefont.hpp> #include <SDL/SDL_ttf.h> -// Should stay here because of Guichan being sensitive to headers order -#include <guichan/sdl/sdlinput.hpp> - #include "focushandler.h" +#include "sdlinput.h" #include "truetypefont.h" #include "viewport.h" #include "window.h" @@ -48,7 +46,7 @@ // Guichan stuff Gui *gui; Viewport *viewport; /**< Viewport on the map. */ -gcn::SDLInput *guiInput; /**< GUI input. */ +SDLInput *guiInput; /**< GUI input. */ // Fonts used in showing hits gcn::Font *hitRedFont; @@ -91,7 +89,7 @@ Gui::Gui(Graphics *graphics): gcn::Image::setImageLoader(&imageLoader); // Set input - guiInput = new gcn::SDLInput(); + guiInput = new SDLInput; setInput(guiInput); // Set focus handler |