Merged 0.0 changes from revision 3317 to 3362 to trunk.

4 files changed, 8 insertions, 8 deletions

diff --git a/src/gui/chatinput.cpp b/src/gui/chatinput.cpp
index 2aa5a159..fc5d6aab 100644
--- a/src/gui/chatinput.cpp
+++ b/src/gui/chatinput.cpp
@@ -26,9 +26,11 @@
 ChatInput::ChatInput()
 {
     setVisible(false);
+
+    addFocusListener(this);
 }
 
-void ChatInput::focusLost()
+void ChatInput::focusLost(const gcn::Event &event)
 {
     setVisible(false);
 }
diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h
index 59d0daf3..da2342ae 100644
--- a/src/gui/chatinput.h
+++ b/src/gui/chatinput.h
@@ -26,10 +26,12 @@
 
 #include "textfield.h"
 
+#include <guichan/focuslistener.hpp>
+
 /**
  * The chat input hides when it loses focus. It is also invisible by default.
  */
-class ChatInput : public TextField
+class ChatInput : public TextField, public gcn::FocusListener
 {
     public:
         /**
@@ -41,7 +43,7 @@ class ChatInput : public TextField
          * Called if the chat input loses focus. It will set itself to
          * invisible as result.
          */
-        void focusLost();
+        void focusLost(const gcn::Event &event);
 };
 
 #endif
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index fb7144a1..b9b15429 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -199,10 +199,6 @@ void
 Gui::logic()
 {
     gcn::Gui::logic();
-
-    // Work around Guichan bug of only applying focus on mouse or keyboard
-    // events.
-    mFocusHandler->applyChanges();
 }
 
 void
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 8930af3e..cd1507a7 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -264,7 +264,7 @@ void Setup_Video::apply()
                 }
             }
         } else {
-            new OkDialog("Switching to FullScreen",
+            new OkDialog("Switching to full screen",
                     "Restart needed for changes to take effect.");
         }
         config.setValue("screen", fullscreen ? 1 : 0);