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

Timestamp:

May 26, 2006, 1:21:32 PM (19 years ago)

Author:

bensch

Message:

trunk: merge Check in the Event-changes:
r7867 | bensch | 2006-05-26 13:19:46 +0200 (Fri, 26 May 2006) | 1 line

Events better subscribed

---

r7866 | bensch | 2006-05-26 13:11:10 +0200 (Fri, 26 May 2006) | 1 line

Events are subscribed at the EventListener, and not the EventHandler

Location:

trunk/src/lib/gui/gl_gui

Files:

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

trunk/src/lib/gui/gl_gui/glgui_handler.cc

@@ -31 +31 @@
     this->setClassID(CL_GLGUI_HANDLER, "GLGuiHandler");
     this->setName("GLGuiHandler");
+
+    //this->subscribeEvent()
 
   }

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

@@ -56 +56 @@
     bool focusOverWidget(float x, float y);
 
-    // if something was clickt on the GUI-widget.
+
+    virtual void update() {};
+    virtual void draw() const;
+
+    Material& backMaterial() { return this->backMat; };
+    const Material& backMaterial() const { return this->backMat; };
+
+    Material& frontMaterial() { return this->frontMat; };
+    const Material& frontMaterial() const { return this->frontMat; };
+
+  protected:
+        // if something was clickt on the GUI-widget.
     virtual void clicked(const Event& event) {};
     virtual void released(const Event& event) {};
@@ -65 +76 @@
     virtual void destroyed() {};
 
-    virtual void update() {};
-    virtual void draw() const;
 
-    Material& backMaterial() { return this->backMat; };
-    Material& frontMaterial() { return this->frontMat; };
-
-  protected:
     inline void startDraw() const { glPushMatrix(); glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0); };
     inline void endDraw() const { glPopMatrix(); };