Changeset 3625 in orxonox.OLD for orxonox/trunk/src/lib/gui/gui/orxonox_gui_gtk.h

Timestamp:

Mar 22, 2005, 1:37:59 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the branches/updater back to the trunk.
merged with command
svn merge -r 3423:HEAD branches/updater/src/gui trunk/src/lib/graphics/gui/gui.

I do not wish to make such jokes again, because it is even worse than copy-pasting. All Files had to be eddited manually, and many diffs where a little bit strange (artifacts).

File:

• orxonox/trunk/src/lib/gui/gui/orxonox_gui_gtk.h (modified) (4 diffs)

orxonox/trunk/src/lib/gui/gui/orxonox_gui_gtk.h

@@ -217 +217 @@
   void saveability(void);
   void saveability(bool isSaveable);
+  virtual char* save(void);
+  virtual void load(char* loadString);
+
   bool isSaveable(void);
   void setFlagName(char* flagname, int defaultvalue);
@@ -286 +289 @@
   GtkWidget* menu;                      //!< The menu That will hold the Options.
 #endif /* HAVE_GTK2 */
-  va_list itemlist;                     //!< The list to readin multiple Options.
-  
+
   //! A struct to handle the MenuItems
   struct MenuItem
   {
-    char* name;                         //!< The name of this entry. 
+    char* name;                         //!< The name of this entry.
+    int itemNumber;                     //!< The n'th entry of this menu;
 #ifdef HAVE_GTK2
     GtkWidget* item;                    //!< One Item From a Menu.
@@ -305 +308 @@
   virtual ~Menu(void);
   void init(void);
+
+  virtual char* save(void);
+  virtual void load(char* loadString);
   
   void addItem(char* itemName);
@@ -322 +328 @@
   
   void setValue(char* newValue);
+
+  virtual char* save(void);
+  virtual void load(char* loadString);
+
   void redraw(void);
   void changeOption(void);