Changeset 4086 in orxonox.OLD for orxonox/trunk/src/lib/gui/gui/gui_keys.h

Timestamp:

May 6, 2005, 4:51:48 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: keySelector is now extern from Player

File:

• orxonox/trunk/src/lib/gui/gui/gui_keys.h (modified) (3 diffs)

orxonox/trunk/src/lib/gui/gui/gui_keys.h

@@ -20 +20 @@
 enum KEYS {UP, DOWN, LEFT, RIGHT, SHOOT};
 
+//! One KeyOption has one InputKey
+struct InputKey
+{
+  Box* pKeyBox;           //!< One Box that holds the Keys
+  Button* pKeyButton;     //!< The Button for changing the Key.
+  OptionLabel* pKeyOLabel;//!< The Label for displaying the Key-setting.
+};
+
+
 class Player;
 //! Class that creates the Keys-Options.
@@ -34 +43 @@
   GuiKeys(void);
   ~GuiKeys(void);
+
+  static Window* inputWindow; //!< A Window that gets keyboard clicks. Static, because only one needed.
+  static Button* inputButton; //!< A Button that gets keyboard clicks. Static, because only one needed.
+  static long keySignal;      //!< A keySignal that handles keyboard clicks. Static, because only one needed.
+
 };
 
@@ -48 +62 @@
   Button* closeButton;    //!< The CloseButton for this key-settings.
   Box* pKeysBox;          //!< The Box that holds the Key-settings.
-  
-  //! One KeyOption has one InputKey
-  struct InputKey
-  {
-    Box* pKeyBox;           //!< One Box that holds the Keys
-    Button* pKeyButton;     //!< The Button for changing the Key.
-    OptionLabel* pKeyOLabel;//!< The Label for displaying the Key-setting.
-  };
 
-  InputKey* inputKey[10];     //!< Buttons-array. \todo make it dynamic.
+  //  InputKey* inputKey[10];     //!< Buttons-array. \todo make it dynamic.
 
-  static Window* inputWindow; //!< A Window that gets keyboard clicks. Static, because only one needed.
-  static Button* inputButton; //!< A Button that gets keyboard clicks. Static, because only one needed.
-  static long keySignal;      //!< A keySignal that handles keyboard clicks. Static, because only one needed.
  public:
   Player(char* player);
 
-  Widget* addKey(KEYS key, char* name);
 
   Button* getOpenButton(void);
 
-#ifdef HAVE_GTK2
-  static gint inputWindowEvent(GtkWidget* w, GdkEventKey* event, void* widget);
-  static gint key_cb(GtkWidget* w, GdkEventKey* event, void* inputKey);
-#endif /* HAVE_GTK2 */
   void setkey(KEYS key);
   
 };
 
+Widget* addKey(KEYS key, char* name);
+#ifdef HAVE_GTK2
+gint inputWindowEvent(GtkWidget* w, GdkEventKey* event, void* widget);
+gint key_cb(GtkWidget* w, GdkEventKey* event, void* inputKey);
+#endif /* HAVE_GTK2 */