Changeset 9110 in orxonox.OLD for trunk/src/lib/gui

Timestamp:

Jul 4, 2006, 11:18:41 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Presentation back

Location:

trunk/src/lib/gui

Files:

• gl/glgui_box.cc (modified) (1 diff)
• gtk/gui_gtk.cc (modified) (1 diff)

trunk/src/lib/gui/gl/glgui_box.cc

@@ -59 +59 @@
   void GLGuiBox::unpack(GLGuiWidget* widget)
   {
-    assert(widget == NULL);
+    assert(widget != NULL);
 
     std::vector<GLGuiWidget*>::iterator delWidget = std::find(this->children.begin(), this->children.end(), widget);

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

@@ -30 +30 @@
 #include <string.h>
 #include <stdlib.h>
-#include <math.h>
+#include <cmath>
 
 using namespace std;