From 57b4d184f8c47c853ca49ffb56f99c0533c71d07 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Thu, 20 Sep 2007 22:17:21 +0000
Subject: 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)
---
 src/gui/gui.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/gui/gui.cpp')

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
-- 
cgit v1.2.3-70-g09d2