Changeset 3423 in orxonox.OLD for orxonox/trunk/src/gui/orxonox_gui_flags.h

Timestamp:

Feb 27, 2005, 7:11:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/updater back into the trunk
merged with command: svn merge branches/updater trunk -r 3241:HEAD
resolved conflicts in debug.h in favor of the trunk.

File:

• orxonox/trunk/src/gui/orxonox_gui_flags.h (modified) (1 diff)

orxonox/trunk/src/gui/orxonox_gui_flags.h

@@ -17 +17 @@
   CheckButton* shortFlags;    //!< CheckButton to change the display of short and long flags \todo show long if long not availible...
   Label* flagsLabel;          //!< The Label of the Flags
-  char* flagText;             //!< The Text of the Label. \todo Delete when Object is destroyed.
 
  public:
-  OrxonoxGuiFlags (Widget* widget);
-  ~OrxonoxGuiFlags ();
+  OrxonoxGuiFlags(void);
+  ~OrxonoxGuiFlags(void);
 
-  void setTextFromFlags (Widget* widget);
-  void OrxonoxGuiFlags::FlagsText(Widget* widget);
+  void setTextFromFlags(Widget* widget);
+  static void flagsText(Widget* widget, void* flagInfo);
   
-  Widget* getWidget ();
+  struct FlagInfo
+  {
+    CheckButton* shortFlags;
+    Label* flagsLabel;
+  };
+  Widget* getWidget(void);
 };
 #endif /* _ORXONOX_GUI_FLAGS_H */