TMW now uses latest Guichan CVS, and doesn't work with Guichan 0.2.0 anymore!

Also fixed a crash on clicking wallpaper in login phase.

1 files changed, 1 insertions, 18 deletions

diff --git a/src/gui/gui.h b/src/gui/gui.h
index 3bcffc5d..5051b788 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -38,7 +38,7 @@
  *
  * \ingroup GUI
  */
-class Gui : public gcn::MouseListener
+class Gui : public gcn::Gui, public gcn::MouseListener
 {
     public:
         /**
@@ -52,21 +52,6 @@ class Gui : public gcn::MouseListener
         ~Gui();
 
         /**
-         * Focus none of the Widgets in the Gui.
-         */
-        void focusNone();
-
-        /**
-         * Performs the Gui:s logic by calling all logic functions
-         * down in the Gui heirarchy. Logic can be just about anything
-         * like adjusting a Widgets size or doing some calculations.
-         *
-         * NOTE: Logic also deals with user input (Mouse and Keyboard)
-         *       for Widgets.
-         */
-        void logic();
-
-        /**
          * Draws the whole Gui by calling draw functions down in the
          * Gui hierarchy. It also draws the mouse pointer.
          */
@@ -86,8 +71,6 @@ class Gui : public gcn::MouseListener
         gcn::ImageFont *guiFont;              /**< The global GUI font */
 
         bool topHasMouse;
-
-        gcn::FocusHandler *focusHandler;
 };
 
 extern Gui *gui;