Changeset 8673 in orxonox.OLD for branches/gui/src/lib

Timestamp:

Jun 21, 2006, 3:43:44 PM (19 years ago)

Author:

bensch

Message:

added game_menu.cc

Location:

branches/gui/src/lib/gui/gl

Files:

• glgui_handler.cc (modified) (1 diff)
• glgui_widget.h (modified) (4 diffs)

branches/gui/src/lib/gui/gl/glgui_handler.cc

@@ -102 +102 @@
   void GLGuiHandler::selectNext()
   {
-    printf("searching next Widget\n");
     // retrieve Objects.
     const std::list<BaseObject*>* objects = ClassList::getList(CL_GLGUI_WIDGET);

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

@@ -48 +48 @@
     /** @returns true if the widget is focusable */
     bool focusable() const { return this->_focusable; };
-    /** @param focusable sets if the Widget should be focusable */
-    void setFocusable(bool focusable = true) { this->_focusable = focusable; };
     /** @returns true if the position is inside of the Widget. @param position the position to check */
     bool focusOverWidget(const Vector2D& position) const;
@@ -63 +61 @@
     /** @returns true if the Widget is selectable */
     bool selectable() const { return this->_selectable; }
-    /** @param selectable true if the widget should be selectable */
-    void setSelectable(bool selectable) { this->_selectable = selectable; }
 
     /** @returns the currently Selected Widget (NULL if none is selected). */
@@ -74 +70 @@
     void release(const Vector2D& pos);
     bool clickable() const { return this->_clickable; };
-    void setClickable(bool clickable = true) { this->_clickable = clickable; };
 
     static void connect(GLGuiWidget* sender, Signal& signal, BaseObject* receiver, Slot executor);
@@ -238 +233 @@
 
   protected:
+    /** @param focusable sets if the Widget should be focusable */
+    void setFocusable(bool focusable = true) { this->_focusable = focusable; };
+    /** @param selectable true if the widget should be selectable */
+    void setSelectable(bool selectable) { this->_selectable = selectable; }
+    /** @param focusable true if the widget should be focusable */
+    void setClickable(bool clickable = true) { this->_clickable = clickable; };
+
+
     /// RENDERING
     inline void beginDraw() const { glPushMatrix(); glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0); };