Changeset 3158 in orxonox.OLD for orxonox/trunk

Timestamp:

Dec 11, 2004, 11:55:08 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: safer (char* initialization), nicer _n →N

Location:

orxonox/trunk/gui

Files:

• orxonox_gui_flags.cc (modified) (1 diff)
• orxonox_gui_gtk.cc (modified) (12 diffs)
• orxonox_gui_gtk.h (modified) (1 diff)
• orxonox_gui_keys.cc (modified) (2 diffs)

orxonox/trunk/gui/orxonox_gui_flags.cc

@@ -74 +74 @@
 {
   if (widget->isOption >= 1)
-    if  (static_cast<Option*>(widget)->value != static_cast<Option*>(widget)->default_value && (strcmp (static_cast<Option*>(widget)->flag_name, "") || strcmp (static_cast<Option*>(widget)->flag_name_short, "")))
+    if  (static_cast<Option*>(widget)->value != static_cast<Option*>(widget)->defaultValue && (static_cast<Option*>(widget)->flagName || static_cast<Option*>(widget)->flagNameShort ))
       {
         if (shortFlags->isActive())
           {
             strcat (flagText, " -");
-            strcat (flagText, static_cast<Option*>(widget)->flag_name_short);
+            strcat (flagText, static_cast<Option*>(widget)->flagNameShort);
           }
         else
           {
             strcat (flagText, " --");
-            strcat (flagText, static_cast<Option*>(widget)->flag_name);
+            strcat (flagText, static_cast<Option*>(widget)->flagName);
           }
         if (static_cast<Option*>(widget)->isOption == 2)

orxonox/trunk/gui/orxonox_gui_gtk.cc

@@ -69 +69 @@
 {
   next = NULL;
-  label = "";
+  label = NULL;
   return;
 }
@@ -331 +331 @@
 void Window::setTitle (char* title)
 {
-  label=title;
+  if (label)
+    delete label;
+  label = new char[strlen(title)+1];
+  strcpy(label, title);
   gtk_window_set_title (GTK_WINDOW (widget), title);
 }
@@ -438 +441 @@
 void Frame::setTitle (char* title)
 {
-  label = title;
+  if (label)
+    delete label;
+  label = new char[strlen(title)+1];
+  strcpy(label, title);
   gtk_frame_set_label (GTK_FRAME (widget), title);
 }
@@ -481 +487 @@
 void EventBox::setTitle (char* title)
 {
-  label = title;
+  if (label)
+    delete label;
+  label = new char[strlen(title)+1];
+  strcpy(label, title);
 }
 
@@ -552 +561 @@
 Image::Image (char* imagename)
 {
+  if (label)
+    delete label;
+  label = new char[strlen(imagename)+1];
+  strcpy(label, imagename);
+
   this->init();
   widget = gtk_image_new_from_file (imagename);
-  label = imagename;
 }
 
@@ -577 +590 @@
 {
   value = 0;
-  flag_name = "";
-  flag_name_short = "";
+  flagName = NULL;
+  flagNameShort = NULL;
   saveable = false;
-  default_value = 0;
+  defaultValue = 0;
 
   static_cast<Widget*>(this)->init();
@@ -595 +608 @@
 void Option::setFlagName (char* flagname, int defaultvalue)
 {
-  flag_name = flagname;
-  default_value = defaultvalue;
+  if (flagName)
+    delete flagName;
+  flagName = new char [strlen(flagname)+1];
+  strcpy(flagName, flagname);
+  defaultValue = defaultvalue;
   cout << "Set Flagname of " << label << " to " << flagname << endl;
 }
@@ -608 +624 @@
 void Option::setFlagName (char* flagname, char* flagnameshort,  int defaultvalue)
 {
-  flag_name = flagname;
-  flag_name_short = flagnameshort;
-  default_value = defaultvalue;
+  if (flagName)
+    delete flagName;
+  flagName = new char [strlen(flagname)+1];
+  strcpy(flagName, flagname);
+
+  if (flagNameShort)
+    delete flagNameShort;
+  flagNameShort = new char [strlen(flagnameshort)+1];
+  strcpy(flagName, flagnameshort);
+  defaultValue = defaultvalue;
   cout << "Set Flagname of " << label << " to " << flagname << endl;
 }
@@ -689 +712 @@
 void CheckButton::setTitle(char* title)
 {
-  label = title;
+  if (label)
+    delete label;
+  label = new char[strlen(title)+1];
+  strcpy(label, title);
   gtk_button_set_label(GTK_BUTTON(widget), title);
 }
@@ -754 +780 @@
 void Slider::setTitle(char* title)
 {
-  label = title;
+  if (label)
+    delete label;
+  label = new char[strlen(title)+1];
+  strcpy(label, title);
 }
 
@@ -833 +862 @@
 void Menu::setTitle(char* title)
 {
-  label = title;
+  if (label)
+    delete label;
+  label = new char[strlen(title)+1];
+  strcpy(label, title);
 }
 
@@ -930 +962 @@
 void Label::setText (char* text)
 {
-  label = text;
+  if (label)
+    delete label;
+  label = new char[strlen(text)+1];
+  strcpy(label, text);
   gtk_label_set_text (GTK_LABEL (this->widget), text);
 }

orxonox/trunk/gui/orxonox_gui_gtk.h

@@ -181 +181 @@
 
   int value; //!< every option has a value either true or false (0,1) or something else like 25 for 25% of the volume
-  char* flag_name; //!< options have a flag name that will be appendet if you start the Program from the GUI.
-  char* flag_name_short; //!< like flag_name but shorter
-  int default_value; //!< A default value is good, for hiding a option if it is not needed. (hidden if value == default_value)
+  char* flagName; //!< options have a flag name that will be appendet if you start the Program from the GUI.
+  char* flagNameShort; //!< like flag_name but shorter
+  int defaultValue; //!< A default value is good, for hiding a option if it is not needed. (hidden if value == default_value)
   bool saveable;  //! Options can be Saved.
 

orxonox/trunk/gui/orxonox_gui_keys.cc

@@ -84 +84 @@
   inputButton = new Button ("test");
   inputWindow->fill (inputButton);
-  inputWindow->connectSignal("destroy", inputWindow, Widget::doNothingSignal);
-  inputWindow->connectSignal("delete_event", inputWindow, Widget::doNothingSignal);
+  inputWindow->connectSignal("destroy",  Widget::doNothingSignal);
+  inputWindow->connectSignal("delete_event", Widget::doNothingSignal);
 
 }
@@ -255 +255 @@
       break;
     }
+
   inputkey->pKeyOLabel->setTitle (title);
   inputButton->disconnectSignal(keySignal);