Changeset 2587 in orxonox.OLD

Timestamp:

Oct 17, 2004, 12:48:07 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: added init-routine to Menu as promised in last comit-message

Location:

orxonox/trunk/gui

Files:

• orxonox_gui.cc (modified) (1 diff)
• orxonox_gui.h (modified) (1 diff)

orxonox/trunk/gui/orxonox_gui.cc

@@ -582 +582 @@
    * Creates an Menu-Item-list out of multiple input. Consider, that the last input argument has to be "lastItem" for this to work.
    */
+  this->init();
+  this->setTitle(menuname);
+    
+  char *itemName;
+  
+  va_start (itemlist, menuname);
+  while (strcmp (itemName = va_arg (itemlist, char*), "lastItem"))
+    {
+      this->addItem(itemName);
+    }
+  va_end(itemlist);
+
+  gtk_option_menu_set_menu (GTK_OPTION_MENU (widget), menu);
+  this->connectSignal ("changed", this->OptionChange);
+}
+
+void Menu::init(void)
+{
   is_option = 2;
   value = 0;
   next = NULL;
-  option_name = menuname;
   flag_name = "";
   flag_name_short = "";
   default_value = 0;
-  char *tmp;
-  va_list itemlist;
   widget = gtk_option_menu_new ();
-  GtkWidget* menu = gtk_menu_new ();
-  GtkWidget* item;
-
-  va_start (itemlist, menuname);
-  while (strcmp (tmp = va_arg (itemlist, char*), "lastItem"))
-    {
-      item = gtk_menu_item_new_with_label (tmp);
-      gtk_menu_shell_append(GTK_MENU_SHELL (menu), item);
-    }
-  va_end(itemlist);
-
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (widget), menu);
-  this->connectSignal ("changed", this->OptionChange);
-}
-
-void Menu::init(void)
-{
+  menu = gtk_menu_new ();
+
+}
+
+void Menu::setTitle(char* title)
+{
+  option_name = title;
+}
+
+void Menu::addItem (char* itemName)
+{
+  item = gtk_menu_item_new_with_label (itemName);
+  gtk_menu_shell_append(GTK_MENU_SHELL (menu), item);
 }
 

orxonox/trunk/gui/orxonox_gui.h

@@ -178 +178 @@
 class Menu : public Option
 {
+ private:
+  GtkWidget* menu;
+  GtkWidget* item;
+  va_list itemlist;
+  
  public:
   Menu (char* menuname, ...);
   ~Menu ();
-  void init(void);   /// HAS TO BE IMPLEMENTED!! most difficult :-)
-
+  void init(void);
+
+  void setTitle(char* title);
+
+  void addItem(char* itemName);
   static gint OptionChange (GtkWidget* widget, Widget* menu);
   void redraw();