Merged most of the changes in biggeruniverse's second memory cleanup patch.

1 files changed, 17 insertions, 17 deletions

diff --git a/src/gui/setup.h b/src/gui/setup.h
index 7e75c2b0..64358176 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -72,6 +72,23 @@ class ModeListModel : public gcn::ListModel
  */
 class Setup : public Window, public gcn::ActionListener
 {
+    public:
+        /**
+         * Constructor.
+         */
+        Setup();
+
+        /**
+         * Destructor.
+         */
+        ~Setup();
+
+        /**
+         * Event handling method.
+         */
+        void
+        action(const std::string& eventId);
+
     private:
         ModeListModel *modeListModel;
 
@@ -97,23 +114,6 @@ class Setup : public Window, public gcn::ActionListener
         bool openGLEnabled;
         bool customCursorEnabled;
         bool soundEnabled;
-
-    public:
-        /**
-         * Constructor.
-         */
-        Setup();
-
-        /**
-         * Destructor.
-         */
-        ~Setup();
-
-        /**
-         * Event handling method.
-         */
-        void
-        action(const std::string& eventId);
 };
 
 extern Setup *setupWindow;