Changeset 1993 in orxonox.OLD for orxonox/branches/gui

Timestamp:

Jun 20, 2004, 9:42:34 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/gui: removed segmentation fault created by not putting a NULL to Window::down

Location:

orxonox/branches/gui/guicc

Files:

• orxonox_gui.cc (modified) (2 diffs)
• orxonox_gui.h (modified) (5 diffs)

orxonox/branches/gui/guicc/orxonox_gui.cc

@@ -146 +146 @@
    */
   is_option = -1;
+  next = NULL;
+  down = NULL;
   widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_policy (GTK_WINDOW(widget), TRUE, TRUE, TRUE);
-  next = NULL;
-  down = NULL;
 }
 
@@ -158 +158 @@
    */
   is_option = -1;
+  next = NULL;
+  down = NULL;
   widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_policy (GTK_WINDOW (widget), TRUE, TRUE, TRUE);

orxonox/branches/gui/guicc/orxonox_gui.h

@@ -86 +86 @@
 
   Widget* down;
-  void fill (Widget *lowerWidget);
+  void fill (Widget* lowerWidget);
 
 };
@@ -98 +98 @@
   char* option_name;
   char* flag_name;
+  char* flag_name_short;
+  int default_value;
 
-  void setFlagName (char *flagname);
+  void setFlagName (char* flagname);
 };
 
@@ -114 +116 @@
   CheckButton (char* buttonname);
   ~CheckButton (void);
-  static gint OptionChange (GtkWidget *widget, Widget* checkbutton);
+  static gint OptionChange (GtkWidget* widget, Widget* checkbutton);
 };
 
@@ -123 +125 @@
   ~Slider ();
   int i;
-  static gint OptionChange (GtkWidget *widget, Widget* slider);
+  static gint OptionChange (GtkWidget* widget, Widget* slider);
 };
 
@@ -132 +134 @@
   ~Menu ();
 
-  static gint OptionChange (GtkWidget *widget, Widget* menu);
+  static gint OptionChange (GtkWidget* widget, Widget* menu);
 };