Changeset 3300 in orxonox.OLD for orxonox/branches/updater/src/gui/orxonox_gui_gtk.cc

Timestamp:

Dec 27, 2004, 4:14:47 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: implemented a new SignalHandler, signals for starting and quiting the Gui are now located in OrxonoxGuiExec.
Now thinking about a way to pass options to Orxonox (so the GUI really makes sense)

File:

• orxonox/branches/updater/src/gui/orxonox_gui_gtk.cc (modified) (3 diffs)

orxonox/branches/updater/src/gui/orxonox_gui_gtk.cc

@@ -34 +34 @@
 // temporarily.
 #include "orxonox_gui_flags.h"
-#include "orxonox_gui_exec.h"
 extern Window* orxonoxGUI;
 extern OrxonoxGuiFlags* flags;
-extern OrxonoxGuiExec* exec;
 
 #ifdef HAVE_GTK2
@@ -306 +304 @@
    \brief Connect a signal with additionally passing a whole external Object
 */
+gulong Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, void *))
+{
+  return g_signal_connect (G_OBJECT (this->widget), event, G_CALLBACK (signal), extObj);
+}
+
+/**
+   \brief Connect a signal with additionally passing a whole external Object
+*/
 gulong Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEventKey*, void *))
 {
@@ -615 +621 @@
 }
 
-/**
- * Quits the orxonox_GUI.
- * This can be called as a Signal and is therefor static
- \param widget The widget that called this function
- \param event the event that happened to execute this function
- \param data some data passed with the Signal
- */
-gint Window::orxonox_gui_quit (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-  if (exec->shouldsave())
-    exec->writeToFile (Window::mainWindow);
-
-  gtk_main_quit();
-  return FALSE;
-}
 #endif /* HAVE_GTK2 */