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

Timestamp:

Dec 26, 2005, 3:01:14 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new GUI-functionality

File:

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

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

@@ -10 +10 @@
 #include "event.h"
 
+#include "material.h"
+
 #include "glincl.h"
 #include "executor/executor.h"
@@ -19 +21 @@
 {
   GLGuiSignal_click     = 0,
-  GLGuiSignal_release   = 1,
-  GLGuiSignal_rollOn    = 2,
-  GLGuiSignal_rollOff   = 3,
-  GLGuiSignal_open      = 4,
-  GLGuiSignal_close     = 5,
-  GLGuiSignal_destroy   = 6,
+  GLGuiSignal_release,
+  GLGuiSignal_rollOn,
+  GLGuiSignal_rollOff,
+  GLGuiSignal_open,
+  GLGuiSignal_close,
+  GLGuiSignal_destroy,
 
-  GLGuiSignalCount      = 7,
+  GLGuiSignalCount,
 } GLGuiSignalType;
 
@@ -68 +70 @@
     inline void endDraw() const { glPopMatrix(); };
 
-  private:
-    Material*             backMat;
+  protected:
+    Material              backMat;
     GLuint                backModel;
 
-    Material*             frontMat;
+    Material              frontMat;
     GLuint                frontModel;