Context Navigation

Changeset 8441 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

gui: less compile-time for gui

Location:

branches/gui

Files:

r4976	r8441
28	28	include doc/documentation.am
29	29	endif
	30
	31
	32	version:
	33	echo VERSION: $(PACKAGE_VERSION)

-                      r8145
+                      r8441
     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
 };

-                      r8440
+                      r8441
 #define _GLGUI_STYLE_H
+// FORWARD DECLARATION
+#include "glgui_defs.h"
 #include "font.h"
 …
       FeatureBottom,        //!< At the Bottom of the rest of the Widget.
     } FeaturePosition;
   public:
 …
     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.

-                      r8440
+                      r8441
   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);

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

-                      r8145
+                      r8441
 #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.

Note: See TracChangeset for help on using the changeset viewer.