diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-09-20 22:17:21 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-01-06 15:13:31 -0700 |
| commit | 57b4d184f8c47c853ca49ffb56f99c0533c71d07 (patch) | |
| tree | 54a11279aee22c6da542f02cc772086aa7b6c27f /src/gui/gui.cpp | |
| parent | ea50de0b56063f3e7c6436422d275ac6e71d0072 (diff) | |
| download | mana-client-57b4d184f8c47c853ca49ffb56f99c0533c71d07.tar.gz mana-client-57b4d184f8c47c853ca49ffb56f99c0533c71d07.tar.bz2 mana-client-57b4d184f8c47c853ca49ffb56f99c0533c71d07.tar.xz mana-client-57b4d184f8c47c853ca49ffb56f99c0533c71d07.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 f33d9495..7cf1881c 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -24,11 +24,9 @@ #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 "gui.h" +#include "sdlinput.h" #include "truetypefont.h" #include "viewport.h" #include "window.h" @@ -47,7 +45,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; @@ -97,7 +95,7 @@ Gui::Gui(Graphics *graphics): gcn::Image::setImageLoader(&imageLoader); // Set input - guiInput = new gcn::SDLInput(); + guiInput = new SDLInput; setInput(guiInput); // Set focus handler |