support misc_*model as misc_model in the radiant editor (way more convenient)

[xonotic/netradiant.git] / radiant / dialog.cpp

diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp
index cb5c7069cd391dd6a48cb323d6fde06cb68c089d..d3e4dba131d57a78c4d2c36f3ba6d6c190667c9f 100644 (file)
--- a/radiant/dialog.cpp
+++ b/radiant/dialog.cpp
@@ -96,7 +96,7 @@ GtkSpinButton* DialogSpinner_new(double value, double lower, double upper, int f
   {
     ++digits;
   }
-  GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(value, lower, upper, step, 10, 10)), step, digits)); 
+  GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(value, lower, upper, step, 10, 0)), step, digits)); 
   gtk_widget_show(GTK_WIDGET(spin));
   gtk_widget_set_size_request(GTK_WIDGET(spin), 64, -1);
   return spin;
@@ -170,31 +170,13 @@ void IntRadioExport(GtkRadioButton& widget, const IntImportCallback& importCallb
 }
 typedef ImportExport<GtkRadioButton, int, IntRadioImport, IntRadioExport> IntRadioImportExport;
 
-template<typename Type, typename Formatter>
-class StringFromType
-{
-  StringOutputStream value;
-public:
-  StringFromType(const Type& type)
-  {
-    value << Formatter(type);
-  }
-  operator const char*() const
-  {
-    return value.c_str();
-  }
-};
-
-typedef StringFromType<const char*, ConvertLocaleToUTF8> LocaleToUTF8;
-typedef StringFromType<const char*, ConvertUTF8ToLocale> UTF8ToLocale;
-
 void TextEntryImport(GtkEntry& widget, const char* text)
 {
-  gtk_entry_set_text(&widget, LocaleToUTF8(text));
+  gtk_entry_set_text(&widget, text);
 }
 void TextEntryExport(GtkEntry& widget, const StringImportCallback& importCallback)
 {
-  importCallback(UTF8ToLocale(gtk_entry_get_text(&widget)));
+  importCallback(gtk_entry_get_text(&widget));
 }
 typedef ImportExport<GtkEntry, const char*, TextEntryImport, TextEntryExport> TextEntryImportExport;
 
@@ -591,7 +573,7 @@ void Dialog::addCombo(GtkWidget* vbox, const char* name, int& data, StringArrayR
   addCombo(vbox, name, values, IntImportCaller(data), IntExportCaller(data));
 }
 
-void Dialog::addSlider(GtkWidget* vbox, const char* name, int& data, gboolean draw_value, const char* low, const char* high, double value, double lower, double upper, double step_increment, double page_increment, double page_size)
+void Dialog::addSlider(GtkWidget* vbox, const char* name, int& data, gboolean draw_value, const char* low, const char* high, double value, double lower, double upper, double step_increment, double page_increment)
 {
 #if 0
   if(draw_value == FALSE)
@@ -613,7 +595,7 @@ void Dialog::addSlider(GtkWidget* vbox, const char* name, int& data, gboolean dr
 #endif
 
   // adjustment
-  GtkObject* adj = gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);
+  GtkObject* adj = gtk_adjustment_new(value, lower, upper, step_increment, page_increment, 0);
   AddIntAdjustmentData(*GTK_ADJUSTMENT(adj), IntImportCaller(data), IntExportCaller(data));
 
   // scale