* patch from Micah Heyer (GtkRadiant Mailinglist)

[xonotic/netradiant.git] / contrib / gtkgensurf / gendlgs.cpp

diff --git a/contrib/gtkgensurf/gendlgs.cpp b/contrib/gtkgensurf/gendlgs.cpp
index 372b833f5b33945775f5ec24a8ecfb1a5c8ea12a..01df80b8a686728980f1b40d915fae696084b395 100644 (file)
--- a/contrib/gtkgensurf/gendlgs.cpp
+++ b/contrib/gtkgensurf/gendlgs.cpp
@@ -894,11 +894,6 @@ static gint bitmap_file_entryfocusout(GtkWidget* widget, GdkEventFocus* event, g
   strcpy (filename, gtk_entry_get_text (GTK_ENTRY(widget)));
   if(strcmp (filename,gbmp.name))
   {
-    if (gbmp.colors)
-    {
-      free(gbmp.colors);
-      gbmp.colors=NULL;
-    }
     strcpy (gbmp.name,filename);
     if (strlen(gbmp.name) )
       OpenBitmap ();
@@ -912,7 +907,7 @@ static void bitmap_browse (GtkWidget *widget, gpointer data)
   const char *filename;
   char *ptr;
 
-  filename = g_FuncTable.m_pfnFileDialog (g_pWnd, TRUE, "Bitmap File", gbmp.defpath, "gtkgensurf");
+  filename = g_FuncTable.m_pfnFileDialog (g_pWnd, TRUE, "Bitmap File", gbmp.defpath, "gtkgensurf", NULL);
 
   if (filename != NULL)
   {
@@ -1393,10 +1388,10 @@ GtkWidget* create_main_dialog ()
   GtkObject *adj;
   GSList *group;
   int i;
-  char *games[] = { "Quake 2", "Half-Life", "SiN", "Heretic 2", "Kingpin", "Genesis3D", "Quake 3 Arena" };
-  char *waveforms[] = { "Alternating hill/valley", "Cylindrical left-to-right", "Cylindrical top-to-bottom",
+  const char *games[] = { "Quake 2", "Half-Life", "SiN", "Heretic 2", "Kingpin", "Genesis3D", "Quake 3 Arena" };
+  const char *waveforms[] = { "Alternating hill/valley", "Cylindrical left-to-right", "Cylindrical top-to-bottom",
                         "From bitmap", "Fractal" };
-  char *orientations[] = { "Ground surface", "Ceiling", "Wall facing 0", "Wall facing 90",
+  const char *orientations[] = { "Ground surface", "Ceiling", "Wall facing 0", "Wall facing 90",
                            "Wall facing 180","Wall facing 270" };
 
   g_pWnd = dlg = gtk_window_new (GTK_WINDOW_TOPLEVEL);