Changeset 3153 in orxonox.OLD for orxonox/trunk/gui/orxonox_gui_keys.cc

Timestamp:

Dec 11, 2004, 6:09:26 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: more modular.

File:

• orxonox/trunk/gui/orxonox_gui_keys.cc (modified) (3 diffs)

orxonox/trunk/gui/orxonox_gui_keys.cc

@@ -57 +57 @@
 Player::Player(char* player)
 {
-  openButton = new Button (player);
-  openButton->connectSignal("button_press_event", this, openWindowEvent);
 
   pKeyWindow = new Window("keys of player");
@@ -69 +67 @@
     
     closeButton = new Button("close");
-    closeButton->connectSignal("button_press_event", this, closeWindowEvent);
+    closeButton->connectSignal("button_press_event", pKeyWindow, Window::windowClose);
     pKeysBox->fill(closeButton);
    pKeyWindow->fill(pKeysBox);
    //  Window::addWindow(pKeyWindow);
+
+  openButton = new Button (player);
+  openButton->connectSignal("button_press_event", pKeyWindow, Window::windowOpen);
+
 }
 
@@ -100 +102 @@
 }
 
-gint Player::openWindowEvent (GtkWidget* widget, GdkEvent* event, void* player)
-{
-  static_cast<Player*>(player)->pKeyWindow->open();
-}
-
-gint Player::closeWindowEvent (GtkWidget* widget, GdkEvent* event, void* player)
-{
-  static_cast<Player*>(player)->pKeyWindow->close();
-}
-
 /**
    \brief Function which gets keystrokes