Changeset 9622 in orxonox.OLD for branches/proxy/src/lib/gui/gl

Timestamp:

Jul 30, 2006, 10:26:56 PM (18 years ago)

Author:

bensch

Message:

better segfault-less packing

Location:

branches/proxy/src/lib/gui/gl

Files:

• glgui_box.cc (modified) (3 diffs)
• glgui_box.h (modified) (1 diff)
• glgui_widget.h (modified) (1 diff)

branches/proxy/src/lib/gui/gl/glgui_box.cc

@@ -90 +90 @@
   }
 
-  void GLGuiBox::pack(GLGuiWidget* widget, GLGuiWidget* widgetPointer)
+  void GLGuiBox::pack(GLGuiWidget* widget, const GLGuiWidget* widgetPointer)
   {
     assert (widget != NULL && widgetPointer != NULL);
@@ -100 +100 @@
       {
         this->_children.insert(it, widget);
+        this->packing(widget);
         return;
       }
@@ -105 +106 @@
     PRINTF(2)("WidgetPointer %p not found, inserting at the end\n", widgetPointer);
     this->pack(widget);
-    this->packing(widget);
   }
 

branches/proxy/src/lib/gui/gl/glgui_box.h

@@ -31 +31 @@
     virtual void pack(GLGuiWidget* widget);
     void pack(GLGuiWidget* widget, unsigned int position);
-    void pack(GLGuiWidget* widget, GLGuiWidget* widgetPointer);
+    void pack(GLGuiWidget* widget, const GLGuiWidget* widgetPointer);
     void packFront(GLGuiWidget* widget);
     void packBack(GLGuiWidget* widget);

branches/proxy/src/lib/gui/gl/glgui_widget.h

@@ -207 +207 @@
 
     void setFont(const Font& font);
-    void setFont(const std::string& fontName, unsigned int renderSize);
+    void setFont(const std::string& fontName, unsigned int renderSize = FONT_DEFAULT_RENDER_SIZE);
 
     void setAnimatedStateChanges(bool animated);