Changeset 4042 in orxonox.OLD

Timestamp:

May 4, 2005, 6:04:16 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: gui: minor niceness-patch

Location:

orxonox/trunk/src

Files:

• lib/gui/gui/orxonox_gui_exec.cc (modified) (4 diffs)
• lib/gui/gui/orxonox_gui_exec.h (modified) (1 diff)
• lib/gui/gui/orxonox_gui_update.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)

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

@@ -64 +64 @@
   this->quit = new Button("Quit");
 #ifdef HAVE_GTK2
-  this->quit->connectSignal("clicked", this, OrxonoxGuiExec::quitOrxonox);
-  //  Window::mainWindow->connectSignal("remove", this, OrxonoxGuiExec::quitOrxonox);
-  Window::mainWindow->connectSignal("destroy", this, OrxonoxGuiExec::quitOrxonox);
+  this->quit->connectSignal("clicked", this, OrxonoxGuiExec::quitGui);
+  //  Window::mainWindow->connectSignal("remove", this, OrxonoxGuiExec::quitGui);
+  Window::mainWindow->connectSignal("destroy", this, OrxonoxGuiExec::quitGui);
 #endif /* HAVE_GTK2 */
   this->execBox->fill(this->quit);
@@ -364 +364 @@
   gtk_widget_destroy(Window::mainWindow->widget);
 #else
-  quitOrxonox(widget, data);
+  quitGui(widget, data);
 #endif /* HAVE_GTK2 */
 
@@ -379 +379 @@
 */
 #ifdef HAVE_GTK2
-int OrxonoxGuiExec::quitOrxonox(GtkWidget* widget, void* data)
+int OrxonoxGuiExec::quitGui(GtkWidget* widget, void* data)
 #else /* HAVE_GTK2 */
-int OrxonoxGuiExec::quitOrxonox(void* widget, void* data)
+int OrxonoxGuiExec::quitGui(void* widget, void* data)
 #endif /* HAVE_GTK2 */
 {
@@ -389 +389 @@
 #ifdef HAVE_GTK2
   gtk_main_quit();
-#endif /* HAVE_GTK2 */
-}
+  while(gtk_events_pending()) gtk_main_iteration();
+#endif /* HAVE_GTK2 */
+}

orxonox/trunk/src/lib/gui/gui/orxonox_gui_exec.h

@@ -51 +51 @@
 #ifdef HAVE_GTK2
   static int startOrxonox(GtkWidget *widget, void* data);
-  static int quitOrxonox(GtkWidget *widget, void* data);
+  static int quitGui(GtkWidget *widget, void* data);
 #else /* HAVE_GTK2 */
   static int startOrxonox(void* widget, void* data);
-  static int quitOrxonox(void* widget, void* data);
+  static int quitGui(void* widget, void* data);
 #endif /* HAVE_GTK2 */
 };

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

@@ -487 +487 @@
   pthread_cancel(*downloadThreadID);
 #else
-  PRINTF(2)("Cannot cancle the Downloading process until after this File, because no threading was enabled");
+  PRINTF(2)("Cannot cancle the Downloading process until after this File, because no threading was enabled\n");
 #endif /* HAVE_PTHREAD_H*/
 }

orxonox/trunk/src/orxonox.cc

@@ -170 +170 @@
   resourceManager = ResourceManager::getInstance();
   if (!resourceManager->setDataDir("../data/"))
-    exit( -1);
+    {
+      PRINTF(1)("Data Could not be located\n");
+      exit( -1);
+    }
 
   PRINT(3)("initializing TextEngine\n");