Changeset 3157 in orxonox.OLD

Timestamp:

Dec 11, 2004, 11:29:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: better signal-handling

Location:

orxonox/trunk/gui

Files:

• orxonox_gui_gtk.cc (modified) (1 diff)
• orxonox_gui_gtk.h (modified) (1 diff)
• orxonox_gui_keys.cc (modified) (2 diffs)

orxonox/trunk/gui/orxonox_gui_gtk.cc

@@ -170 +170 @@
   if (widget->isOption >= 1)
     static_cast<Option*>(widget)->redraw();// <<" is : " << static_cast<Option*>(this)->value <<endl;
+}
+
+gint Widget::doNothingSignal (GtkWidget *widget, GdkEvent* event, void* nothing)
+{
 }
 

orxonox/trunk/gui/orxonox_gui_gtk.h

@@ -50 +50 @@
   static void listOptions (Widget* widget);
   static void setOptions (Widget* widget);
-
+  
+  static gint doNothingSignal (GtkWidget *widget, GdkEvent* event, void* nothing);
 };
 

orxonox/trunk/gui/orxonox_gui_keys.cc

@@ -83 +83 @@
 
   inputButton = new Button ("test");
-  inputButton->connectSignal ("button_press_event", inputWindow, Window::windowClose);
   inputWindow->fill (inputButton);
-  inputWindow->connectSignal("destroy", inputWindow, Window::windowClose);
-  inputWindow->connectSignal("delete_event", inputWindow, Window::windowClose);
+  inputWindow->connectSignal("destroy", inputWindow, Widget::doNothingSignal);
+  inputWindow->connectSignal("delete_event", inputWindow, Widget::doNothingSignal);
 
 }
@@ -123 +122 @@
 gint Player::inputWindowEvent(GtkWidget* w, GdkEventKey* event, void* inputKey)
 {
-  inputButton->setTitle("teste");
+  inputButton->setTitle("press a Key");
   keySignal = inputButton->connectSignal("key_press_event", inputKey, key_cb);
   inputWindow->open();
 }
-
+  
 /**
    \brief Function which gets keystrokes