Changeset 3297 in orxonox.OLD

Timestamp:

Dec 26, 2004, 11:24:41 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: now works for non-gtk-mode too.

Location:

orxonox/branches/updater/src/gui

Files:

• orxonox_gui.cc (modified) (1 diff)
• orxonox_gui_exec.cc (modified) (1 diff)
• orxonox_gui_exec.h (modified) (1 diff)

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

@@ -118 +118 @@
   mainloopGTK();
 #else /* HAVE_GTK2 */
-  PRINTF(0)(" Listing all the Orxonox Options: \n");
-  PRINTF(0)("  #############################\n");
+  PRINT(0)(" Listing all the Orxonox Options: \n");
+  PRINT(0)("  #############################\n");
   orxonoxGUI->walkThrough(orxonoxGUI->listOptions, 0);
 
-  PRINTF(0)("\nDo you want me to save the the above values now? [Yn] ");
+  PRINT(0)("\nDo you want me to save the the above values now? [Yn] ");
   char c = getchar();
   if ((c == 'y' || c == 'Y' || c== 10) && exec->shouldsave())

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

@@ -298 +298 @@
    \param data additional data
 */
-gint OrxonoxGuiExec::startOrxonox (GtkWidget *widget, Widget* data)
+int OrxonoxGuiExec::startOrxonox (GtkWidget* widget, Widget* data)
 {
   cout << "Starting Orxonox" <<endl;
 }
+#else /* HAVE_GTK2 */
+/**
+   \brief Starts ORXONOX. (not really implemented yet, but the function is there.\n
+   This is a Signal and can be executed through Widget::signal_connect
+   \param widget the widget that executed the start command
+   \param data additional data
+*/
+int OrxonoxGuiExec::startOrxonox (void* widget, Widget* data)
+{
+  cout << "Starting Orxonox" <<endl;
+}
+
 #endif /* HAVE_GTK2 */

orxonox/branches/updater/src/gui/orxonox_gui_exec.h

@@ -48 +48 @@
 
 #ifdef HAVE_GTK2
-  static gint startOrxonox (GtkWidget *widget, Widget* data);
+  static int startOrxonox (GtkWidget *widget, Widget* data);
+#else /* HAVE_GTK2 */
+  static int startOrxonox (void* widget, Widget* data);
 #endif /* HAVE_GTK2 */
 };