Changeset 8441 in orxonox.OLD for branches/gui/src

Timestamp:

Jun 15, 2006, 10:22:12 AM (18 years ago)

Author:

bensch

Message:

gui: less compile-time for gui

Location:

branches/gui/src

Files:

• lib/gui/gl/glgui_defs.h (modified) (1 diff)
• lib/gui/gl/glgui_style.h (modified) (3 diffs)
• lib/gui/gl/glgui_widget.h (modified) (1 diff)
• util/hud.cc (modified) (1 diff)
• util/hud.h (modified) (1 diff)

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

@@ -15 +15 @@
     Vertical       //!< Vertical Orientation.
   } Orientation;
+
+  //! An enumerator that defines the different states Widgets may be in.
+  typedef enum {
+    Normal,           //!< Normal state of the GUI's Widgets.
+    Active,           //!< If the widget is Active.
+    Selected,         //!< If the Widget is Selected.
+    Insensitive       //!< If the Widget is insensitive.
+  } State;
+#define GLGUI_STATE_COUNT   4
+
+
 };
 

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

@@ -7 +7 @@
 #define _GLGUI_STYLE_H
 
-// FORWARD DECLARATION
+#include "glgui_defs.h"
 
 #include "font.h"
@@ -27 +27 @@
       FeatureBottom,        //!< At the Bottom of the rest of the Widget.
     } FeaturePosition;
-
-
 
   public:
@@ -51 +49 @@
     StatedStyle;
 
-    StatedStyle      _style[4];
+
+    StatedStyle         _style[GLGUI_STATE_COUNT];
 
     FeaturePosition   _featurePosition;      //!< The Position a Feature will be layed at (checkbox(box), slider(text),...)
-    Font*             _font;                 //!< The Font used in the current Widget.
+    Font*               _font;                 //!< The Font used in the current Widget.
 
 

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

@@ -30 +30 @@
   class GLGuiWidget : public Element2D
   {
-  public:
-    //! An enumerator that defines the different states Widgets may be in.
-    typedef enum {
-      Normal,           //!< Normal state of the GUI's Widgets.
-      Active,           //!< If the widget is Active.
-      Selected,         //!< If the Widget is Selected.
-      Insensitive       //!< If the Widget is insensitive.
-    } State;
-
-
-
   public:
     GLGuiWidget(GLGuiWidget* parent = NULL);

branches/gui/src/util/hud.cc

@@ -21 +21 @@
 
 #include "world_entities/weapons/weapon_manager.h"
-
-using namespace std;
-
+#include "glgui_widget.h"
 
 /**

branches/gui/src/util/hud.h

@@ -7 +7 @@
 #define _HUD_H
 
-#include "glgui_widget.h"
-#include <list>
-
+#include "element_2d.h"
 // FORWARD DECLARATION
 class TiXmlElement;
 class WeaponManager;
+namespace OrxGui { class GLGuiWidget; }
 
 //! A class that renders a HUD.