Changeset 4062 in orxonox.OLD for orxonox/trunk

Timestamp:

May 5, 2005, 3:36:51 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: now the gui also starts orxonox if in non-GTK-mode

Location:

orxonox/trunk/src/lib/gui/gui

Files:

• gui.cc (modified) (1 diff)
• gui_exec.cc (modified) (1 diff)
• gui_gtk.cc (modified) (2 diffs)
• gui_update.cc (modified) (5 diffs)

orxonox/trunk/src/lib/gui/gui/gui.cc

@@ -118 +118 @@
 
   mainloopGUI();
+#ifndef HAVE_GTK2
+  GuiExec::startOrxonox(NULL, exec);
+#endif /* HAVE_GTK2 */
 }
 

orxonox/trunk/src/lib/gui/gui/gui_exec.cc

@@ -362 +362 @@
 #endif /* HAVE_GTK2 */
 {
-  GuiExec* exec =(GuiExec*)data;
+  GuiExec* exec = (GuiExec*)data;
   if(exec->shouldsave())
     exec->writeToFile(Window::mainWindow);

orxonox/trunk/src/lib/gui/gui/gui_gtk.cc

@@ -34 +34 @@
 
 #include "gui_flags.h"
+#include "gui_exec.h"
+
 extern GuiFlags* flags;
 
@@ -120 +122 @@
       
       // here follows the rest.... this will be nasty.
-      //! \todo move this into the gui-gtk-file
       //! \todo finish it.
       //! \todo memory leek at save(); and save is a BAD word, use saveString instead, or something like it.

orxonox/trunk/src/lib/gui/gui/gui_update.cc

@@ -67 +67 @@
   this->updateFrame->fill(this->updateBox);
   this->setMainWidget(this->updateFrame);
-
 }
 
@@ -117 +116 @@
   download(&updateFileInfo);
 }
-#endif /* HAVE_CURL */
-#ifdef HAVE_CURL
+
 /**
    \brief Creates a window, and all it contains for the Data-update.
@@ -129 +127 @@
   // the close-Button of the Update Window.
   //  updateWindowClose = new Button("close");
-#ifdef HAVE_GTK2 
+#ifdef HAVE_GTK2
   //  updateWindowClose->connectSignal("button_press_event", updateWindow, Window::windowClose);
 #endif /* HAVE_GTK2 */
@@ -142 +140 @@
   this->updateDataBegin = new Button("begin.");
   dataInfo->stateButton = this->updateDataBegin;
-#ifdef HAVE_GTK2 
+#ifdef HAVE_GTK2
   dataInfo->buttonSignal = updateDataBegin->connectSignal("button_press_event", dataInfo, updateDataFunc);
 #endif /* HAVE_GTK2 */
@@ -150 +148 @@
 
   this->updateDataWindowButton = new Button("update orxonox::Data");
-#ifdef HAVE_GTK2 
+#ifdef HAVE_GTK2
   this->updateDataWindowButton->connectSignal("button_press_event", this->updateDataWindow, Window::windowOpen);
   this->updateDataWindow->connectSignal("destroy", this->updateDataWindow, Window::windowClose);