Changeset 3291 in orxonox.OLD

Timestamp:

Dec 26, 2004, 4:44:27 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: compiles without GTK again

Location:

orxonox/branches/updater/src/gui

Files:

• orxonox_gui_gtk.cc (modified) (2 diffs)
• orxonox_gui_update.cc (modified) (6 diffs)

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

@@ -116 +116 @@
   //!  \todo not hiding widget, deleting.
   //  this->hide();
+  //  delete this->widget;
 }
 
@@ -430 +431 @@
     PRINTF(3)("deleting the Window.\n");
 
+  this->hide();
   static_cast<Container*>(this)->destroy();
   

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

@@ -142 +142 @@
   updateDataBegin = new Button ("begin.");
   dataInfo->stateButton = updateDataBegin;
+#ifdef HAVE_GTK2 
   dataInfo->buttonSignal = updateDataBegin->connectSignal ("button_press_event", dataInfo, updateDataFunc);
+#endif /* HAVE_GTK2 */
   updateDataBox->fill(updateDataBegin);
 
@@ -336 +338 @@
       curl_easy_setopt(localCurl, CURLOPT_WRITEFUNCTION, curlWriteFunc);
       curl_easy_setopt(localCurl, CURLOPT_READFUNCTION, curlReadFunc);
-      curl_easy_setopt(localCurl, CURLOPT_NOPROGRESS, TRUE);
+      curl_easy_setopt(localCurl, CURLOPT_NOPROGRESS, true);
       
       curl_easy_perform(localCurl);
@@ -379 +381 @@
       curl_easy_setopt(curlHandle, CURLOPT_WRITEFUNCTION, curlWriteFunc);
       curl_easy_setopt(curlHandle, CURLOPT_READFUNCTION, curlReadFunc);
-      curl_easy_setopt(curlHandle, CURLOPT_NOPROGRESS, FALSE);
+      curl_easy_setopt(curlHandle, CURLOPT_NOPROGRESS, false);
       curl_easy_setopt(curlHandle, CURLOPT_PROGRESSFUNCTION, curlProgressFunc);
       curl_easy_setopt(curlHandle, CURLOPT_PROGRESSDATA, info->bar);
@@ -387 +389 @@
           pthread_join(*downloadThreadFinishID, NULL);
 
+#ifdef HAVE_GTK2 
           info->stateButton->disconnectSignal(info->buttonSignal);
           info->buttonSignal = info->stateButton->connectSignal("button_press_event", info, cancelDownload);
+#endif /* HAVE_GTK2 */
 #ifdef HAVE_PTHREAD_H
           info->stateButton->setTitle("cancel");
@@ -436 +440 @@
 #ifdef HAVE_PTHREAD_H
   pthread_join (*downloadThreadID, NULL);
+#ifdef HAVE_GTK2 
   gdk_threads_enter();
+#endif /* HAVE_GTK2 */
 #endif /* HAVE_PTHREAD_H */
   if (curlHandle)
@@ -448 +454 @@
   //  else
   //    info->stateButton->setTitle("done");
+#ifdef HAVE_GTK2 
   info->stateButton->disconnectSignal(info->buttonSignal);
   info->buttonSignal = info->stateButton->connectSignal("button_press_event", info, updateDataFunc);
+#endif /* HAVE_GTK2 */
   isDownloading = false;
 #ifdef HAVE_PTHREAD_H
+#ifdef HAVE_GTK2 
   gdk_threads_leave();
+#endif /* HAVE_GTK2 */
 #endif /* HAVE_PTHREAD_H */