Changeset 9656 in orxonox.OLD for trunk/src/lib/gui/gl/glgui_widget.h

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

• trunk/src/lib/gui/gl/glgui_widget.h (modified) (3 diffs)

trunk/src/lib/gui/gl/glgui_widget.h

@@ -206 +206 @@
     void setFeaturePositionS(const std::string& featurePosition);
 
-    void setFont(const Font& font);
-    void setFont(const std::string& fontName, unsigned int renderSize);
+    virtual void setFont(const Font& font);
+    void setFont(const std::string& fontName, unsigned int renderSize = FONT_DEFAULT_RENDER_SIZE);
 
     void setAnimatedStateChanges(bool animated);
@@ -270 +270 @@
     virtual void destroying();
 
+    // unparent the widget and from this widget seen as parent
+    virtual void removeChildWidget(GLGuiWidget* widget) {};
+
 
     virtual void debug(unsigned int level) const;
@@ -323 +326 @@
     Font                           _font;                 //!< The Font used in the current Widget.
 
+    static Font*                   _defaultFont;          //!< The default Font.
 
     /// ANIMATION STUFF: