Changeset 3303 in orxonox.OLD

Timestamp:

Dec 28, 2004, 1:21:32 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: small fix for compiling without gtk

Location:

orxonox/branches/updater/src/gui

Files:

• orxonox_gui.cc (modified) (1 diff)
• orxonox_gui_update.cc (modified) (1 diff)

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

@@ -119 +119 @@
   // case start-with-gui.
   if (!access(exec->getConfigFile(), F_OK) && static_cast<Option*>(orxonoxGUI->findWidgetByName("Always Show this Menu", 0))->value == 0)
-    OrxonoxGuiExec::startOrxonox(NULL, NULL);
+    OrxonoxGuiExec::startOrxonox(NULL, exec);
   else
+#ifdef HAVE_GTK2
     {
-#ifdef HAVE_GTK2
-  mainloopGTK();
+      mainloopGTK();
+    }
 #else /* HAVE_GTK2 */
-  PRINT(0)(" Listing all the Orxonox Options: \n");
-  PRINT(0)("  #############################\n");
-  orxonoxGUI->walkThrough(orxonoxGUI->listOptions, 0);
+  {
+    PRINT(0)(" Listing all the Orxonox Options: \n");
+    PRINT(0)("  #############################\n");
+    orxonoxGUI->walkThrough(orxonoxGUI->listOptions, 0);
+    
+    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())
+      exec->writeToFile (Window::mainWindow);
+    OrxonoxGuiExec::startOrxonox(NULL, exec);
+  }
 
-  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())
-    exec->writeToFile (Window::mainWindow);
-  OrxonoxGuiExec::startOrxonox(NULL, exec);
 #endif /* HAVE_GTK2 */
-    }
 }

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

@@ -384 +384 @@
       if (!isDownloading)
         {
+#ifdef HAVE_PTHREAD_H     
           pthread_join(*downloadThreadFinishID, NULL);
-
+#endif /* HAVE_PTHREAD_H */
 #ifdef HAVE_GTK2 
           info->stateButton->disconnectSignal(info->buttonSignal);