Changeset 7779 in orxonox.OLD for trunk/src/lib/gui/gl_gui/glgui_widget.h

Timestamp:

May 23, 2006, 10:04:17 PM (18 years ago)

Author:

bensch

Message:

3088 linews changed : trunk: namespaces

File:

• trunk/src/lib/gui/gl_gui/glgui_widget.h (modified) (2 diffs)

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

@@ -9 +9 @@
 #include "element_2d.h"
 #include "event.h"
-
 #include "material.h"
 
 #include "glincl.h"
-#include "executor/executor.h"
+#include "signal_connector.h"
 
 // FORWARD DECLARATION
 class Material;
 
-typedef enum
+namespace OrxGui
 {
-  GLGuiSignal_click     = 0,
-  GLGuiSignal_release,
-  GLGuiSignal_rollOn,
-  GLGuiSignal_rollOff,
-  GLGuiSignal_open,
-  GLGuiSignal_close,
-  GLGuiSignal_destroy,
 
-  GLGuiSignalCount,
-} GLGuiSignalType;
+  typedef enum
+  {
+    GLGuiSignal_click     = 0,
+    GLGuiSignal_release,
+    GLGuiSignal_rollOn,
+    GLGuiSignal_rollOff,
+    GLGuiSignal_open,
+    GLGuiSignal_close,
+    GLGuiSignal_destroy,
 
-//! if the Element should be visible by default.
+    GLGuiSignalCount,
+  } GLGuiSignalType;
+
+  //! if the Element should be visible by default.
 #define GLGUI_WIDGET_DEFAULT_VISIBLE       false
 
-//! This is widget part of the openglGUI class
-/**
- * A widget is the main class of all the elements of th GUI.
- */
-class GLGuiWidget : public Element2D {
+  //! This is widget part of the openglGUI class
+  /**
+   * A widget is the main class of all the elements of th GUI.
+   */
+  class GLGuiWidget : public Element2D
+  {
+  private:
+
   public:
     GLGuiWidget();
     virtual ~GLGuiWidget();
 
-    void init();
-    /** @returns a new char-array containing a string with the options. Delete with delete[]; */
-    virtual char* save() {};
-    /** loads options of the Widget. @param loadString a string containing the Options */
-    virtual void load(const std::string& loadString) {};
-
     void show();
     void hide();
 
-    void connectSignal(GLGuiSignalType signalType, const Executor& signal);
+    void connectSignal(GLGuiSignalType signalType, BaseObject* obj, const Executor* signal);
     void disconnectSignal(GLGuiSignalType signalType);
     bool focusOverWidget(float x, float y);
@@ -73 +72 @@
     inline void endDraw() const { glPopMatrix(); };
 
+  private:
+    void init();
+
   protected:
-    Material              backMat;
-    GLuint                backModel;
+    Material               backMat;
+    GLuint                 backModel;
 
-    Material              frontMat;
-    GLuint                frontModel;
+    Material               frontMat;
+    GLuint                 frontModel;
 
   private:
-    Executor*             widgetSignals[GLGuiSignalCount];
+    std::vector<SignalConnector*> widgetSignals;
 
-    bool                  focusable;        //!< If this widget can receive focus.
-    bool                  clickable;        //!< if this widget can be clicked upon.
-};
-
+    bool                   focusable;        //!< If this widget can receive focus.
+    bool                   clickable;        //!< if this widget can be clicked upon.
+  };
+}
 #endif /* _GLGUI_WIDGET_H */