Changeset 5241 in orxonox.OLD

Timestamp:

Sep 24, 2005, 12:12:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: minor gui-fixes…

Location:

trunk/src/lib

Files:

• graphics/graphics_engine.cc (modified) (1 diff)
• gui/gui_exec.cc (modified) (3 diffs)
• gui/gui_gtk.cc (modified) (1 diff)
• gui/gui_keys.cc (modified) (1 diff)
• gui/gui_update.cc (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -177 +177 @@
   if (iconSurf != NULL)
   {
-    Uint32 colorkey = SDL_MapRGB(iconSurf->format, 255, 0, 255);
+    Uint32 colorkey = SDL_MapRGB(iconSurf->format, 0, 0, 0);
     SDL_SetColorKey(iconSurf, SDL_SRCCOLORKEY, colorkey);
     SDL_WM_SetIcon(iconSurf,NULL);

trunk/src/lib/gui/gui_exec.cc

@@ -206 +206 @@
   char* fileName = ResourceManager::homeDirCheck(confFile);
   iniParser.writeFile(fileName);
-  delete fileName;
+  delete[] fileName;
 }
 
@@ -243 +243 @@
   if(widget->optionType > GUI_NOTHING)
     if (static_cast<Option*>(widget)->isSaveable())
-      parser->addVar(static_cast<Option*>(widget)->title, static_cast<Option*>(widget)->save());
+    {
+      char* saveName = static_cast<Option*>(widget)->save();
+      parser->addVar(static_cast<Option*>(widget)->title, saveName);
+      delete[] saveName;
+    }
 
   if(widget->next != NULL)
@@ -257 +261 @@
   char* fileName = ResourceManager::homeDirCheck(confFile);
   IniParser iniParser(fileName);
-  delete fileName;
+  delete[] fileName;
   if (!iniParser.isOpen())
     return;

trunk/src/lib/gui/gui_gtk.cc

@@ -1594 +1594 @@
 char* OptionLabel::save()
 {
-  return cValue;
+  char* retVal = new char[strlen(cValue)+1];
+  strcpy(retVal, cValue);
+  return retVal;
 }
 

trunk/src/lib/gui/gui_keys.cc

@@ -133 +133 @@
     pKeyWindow->fill(pKeyFrame);
   }
-  delete windowName;
+  delete[] windowName;
   Window::addWindow(pKeyWindow);
 #ifdef HAVE_GTK2

trunk/src/lib/gui/gui_update.cc

@@ -117 +117 @@
       tmpName[strlen(fileName)-strlen(DATA_IDENTIFIER)] = '\0';
       static_cast<OptionLabel*>(object)->setValue(tmpName);
-      delete tmpName;
+      delete[] tmpName;
       return true;
     }