merge gtkgensurf from ZeroRadiant trunk

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

diff --git a/contrib/gtkgensurf/gendlgs.cpp b/contrib/gtkgensurf/gendlgs.cpp
index f2df9ea6e4c35139dfd1b36267840362dc73e558..dcda98a8c5681d09a16a8ef51c8690bc30a13219 100644 (file)
--- a/contrib/gtkgensurf/gendlgs.cpp
+++ b/contrib/gtkgensurf/gendlgs.cpp
@@ -890,11 +890,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 ();
@@ -1389,10 +1384,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);
@@ -1554,7 +1549,7 @@ GtkWidget* create_main_dialog ()
   g_object_set_data (G_OBJECT (dlg), "roughness", entry);
   g_signal_connect (G_OBJECT (entry), "focus_out_event", G_CALLBACK (doublevariable_entryfocusout), &Roughness);
 
-  adj = gtk_adjustment_new (1, 1, 32767, 1, 10, 10);
+  adj = gtk_adjustment_new (1, 1, 32767, 1, 10, 0);
   g_signal_connect (G_OBJECT (adj), "value_changed", G_CALLBACK (general_random), NULL);
   spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
   gtk_widget_show (spin);
@@ -1688,7 +1683,7 @@ GtkWidget* create_main_dialog ()
                     (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0);
   g_object_set_data (G_OBJECT (dlg), "nv_text", label);
 
-  adj = gtk_adjustment_new (8, 1, MAX_ROWS, 1, 10, 10);
+  adj = gtk_adjustment_new (8, 1, MAX_ROWS, 1, 10, 0);
   g_signal_connect (G_OBJECT (adj), "value_changed", G_CALLBACK (extents_nhnv_spin), &NH);
   spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
   gtk_widget_show (spin);
@@ -1698,7 +1693,7 @@ GtkWidget* create_main_dialog ()
   gtk_widget_set_usize (spin, 60, -2);
   g_object_set_data (G_OBJECT (dlg), "nh", spin);
 
-  adj = gtk_adjustment_new (8, 1, MAX_ROWS, 1, 10, 10);
+  adj = gtk_adjustment_new (8, 1, MAX_ROWS, 1, 10, 0);
   g_signal_connect (G_OBJECT (adj), "value_changed", G_CALLBACK (extents_nhnv_spin), &NV);
   spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
   gtk_widget_show (spin);
@@ -1720,7 +1715,7 @@ GtkWidget* create_main_dialog ()
        gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
   gtk_object_set_data (GTK_OBJECT (dlg), "snap_text", label);
 
-       adj = gtk_adjustment_new (8, 0, 256, 1, 10, 10);
+       adj = gtk_adjustment_new (8, 0, 256, 1, 10, 0);
   g_signal_connect (G_OBJECT (adj), "value_changed", G_CALLBACK (extents_snaptogrid_spin), &SP);
   spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
   gtk_widget_show (spin);
@@ -1737,7 +1732,7 @@ GtkWidget* create_main_dialog ()
   gtk_widget_show (label);
   gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 0);
 
-  adj = gtk_adjustment_new (0, 0, 110, 1, 10, 10);
+  adj = gtk_adjustment_new (0, 0, 110, 1, 10, 0);
   g_signal_connect (G_OBJECT (adj), "value_changed", G_CALLBACK (extents_decimate), NULL);
   g_object_set_data (G_OBJECT (dlg), "decimate_adj", adj);
   scale = gtk_hscale_new (GTK_ADJUSTMENT (adj));
@@ -1980,7 +1975,7 @@ GtkWidget* create_main_dialog ()
   gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
   g_object_set_data (G_OBJECT (dlg), "fix_rate_text", label);
 
-  adj = gtk_adjustment_new (0, -65536, 65536, 1, 16, 16);
+  adj = gtk_adjustment_new (0, -65536, 65536, 1, 16, 0);
   g_signal_connect (G_OBJECT (adj), "value_changed", G_CALLBACK (fix_value_changed), NULL);
   spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
   gtk_widget_show (spin);
@@ -2097,7 +2092,7 @@ GtkWidget* create_main_dialog ()
   gtk_widget_show (label);
   gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 0);
 
-  adj = gtk_adjustment_new (60, 0, 90, 1, 10, 10);
+  adj = gtk_adjustment_new (60, 0, 90, 1, 10, 0);
   spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
   gtk_widget_show (spin);
   gtk_box_pack_start (GTK_BOX (hbox2), spin, FALSE, TRUE, 0);