quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Gtk warnings about nonzero page_size in spin buttons

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@353 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-04-28 13:04:53 +00:00
parent 9374d73cbf
commit 3844ff04ac
12 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/gtkgensurf/gendlgs.cpp
View File

@ -1554,7 +1554,7 @@ GtkWidget* create_main_dialog ()
g_object_set_data (G_OBJECT (dlg), "roughness", entry); g_object_set_data (G_OBJECT (dlg), "roughness", entry);
g_signal_connect (G_OBJECT (entry), "focus_out_event", G_CALLBACK (doublevariable_entryfocusout), &Roughness); 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); g_signal_connect (G_OBJECT (adj), "value_changed", G_CALLBACK (general_random), NULL);
spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0); spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gtk_widget_show (spin); gtk_widget_show (spin);
@ -1688,7 +1688,7 @@ GtkWidget* create_main_dialog ()
(GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0); (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0);
g_object_set_data (G_OBJECT (dlg), "nv_text", label); 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); g_signal_connect (G_OBJECT (adj), "value_changed", G_CALLBACK (extents_nhnv_spin), &NH);
spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0); spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gtk_widget_show (spin); gtk_widget_show (spin);
@ -1698,7 +1698,7 @@ GtkWidget* create_main_dialog ()
gtk_widget_set_usize (spin, 60, -2); gtk_widget_set_usize (spin, 60, -2);
g_object_set_data (G_OBJECT (dlg), "nh", spin); 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); g_signal_connect (G_OBJECT (adj), "value_changed", G_CALLBACK (extents_nhnv_spin), &NV);
spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0); spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gtk_widget_show (spin); gtk_widget_show (spin);
@ -1720,7 +1720,7 @@ GtkWidget* create_main_dialog ()
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
gtk_object_set_data (GTK_OBJECT (dlg), "snap_text", label); 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); g_signal_connect (G_OBJECT (adj), "value_changed", G_CALLBACK (extents_snaptogrid_spin), &SP);
spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0); spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gtk_widget_show (spin); gtk_widget_show (spin);
@ -1737,7 +1737,7 @@ GtkWidget* create_main_dialog ()
gtk_widget_show (label); gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 0); 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_signal_connect (G_OBJECT (adj), "value_changed", G_CALLBACK (extents_decimate), NULL);
g_object_set_data (G_OBJECT (dlg), "decimate_adj", adj); g_object_set_data (G_OBJECT (dlg), "decimate_adj", adj);
scale = gtk_hscale_new (GTK_ADJUSTMENT (adj)); scale = gtk_hscale_new (GTK_ADJUSTMENT (adj));
@ -1980,7 +1980,7 @@ GtkWidget* create_main_dialog ()
gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
g_object_set_data (G_OBJECT (dlg), "fix_rate_text", label); 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); g_signal_connect (G_OBJECT (adj), "value_changed", G_CALLBACK (fix_value_changed), NULL);
spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0); spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gtk_widget_show (spin); gtk_widget_show (spin);
@ -2097,7 +2097,7 @@ GtkWidget* create_main_dialog ()
gtk_widget_show (label); gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, TRUE, 0); 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); spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gtk_widget_show (spin); gtk_widget_show (spin);
gtk_box_pack_start (GTK_BOX (hbox2), spin, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox2), spin, FALSE, TRUE, 0);

4
contrib/gtkgensurf/view.cpp
View File

@ -405,14 +405,14 @@ void CreateViewWindow ()
gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
adj = gtk_adjustment_new (30, -90, 90, 1, 10, 10); adj = gtk_adjustment_new (30, -90, 90, 1, 10, 0);
gtk_signal_connect (adj, "value_changed", GTK_SIGNAL_FUNC (preview_spin), &elevation); gtk_signal_connect (adj, "value_changed", GTK_SIGNAL_FUNC (preview_spin), &elevation);
spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0); spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gtk_widget_show (spin); gtk_widget_show (spin);
gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (spin), "focus_out_event", G_CALLBACK (doublevariable_spinfocusout), &elevation); g_signal_connect (G_OBJECT (spin), "focus_out_event", G_CALLBACK (doublevariable_spinfocusout), &elevation);
adj = gtk_adjustment_new (30, 0, 359, 1, 10, 10); adj = gtk_adjustment_new (30, 0, 359, 1, 10, 0);
gtk_signal_connect (adj, "value_changed", GTK_SIGNAL_FUNC (preview_spin), &azimuth); gtk_signal_connect (adj, "value_changed", GTK_SIGNAL_FUNC (preview_spin), &azimuth);
spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0); spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
gtk_widget_show (spin); gtk_widget_show (spin);

8
contrib/prtview/ConfigDialog.cpp
View File

@ -301,7 +301,7 @@ void DoConfigDialog ()
gtk_widget_show (hbox); gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, TRUE, 0);
adj = gtk_adjustment_new (portals.width_3d, 2, 40, 1, 1, 1); adj = gtk_adjustment_new (portals.width_3d, 2, 40, 1, 1, 0);
lw3slider = gtk_hscale_new (GTK_ADJUSTMENT (adj)); lw3slider = gtk_hscale_new (GTK_ADJUSTMENT (adj));
gtk_widget_show (lw3slider); gtk_widget_show (lw3slider);
gtk_box_pack_start (GTK_BOX (hbox), lw3slider, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), lw3slider, TRUE, TRUE, 0);
@ -392,7 +392,7 @@ void DoConfigDialog ()
gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_row_spacings (GTK_TABLE (table), 5);
gtk_table_set_col_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5);
adj = gtk_adjustment_new (portals.trans_3d, 0, 100, 1, 1, 1); adj = gtk_adjustment_new (portals.trans_3d, 0, 100, 1, 1, 0);
transslider = gtk_hscale_new (GTK_ADJUSTMENT (adj)); transslider = gtk_hscale_new (GTK_ADJUSTMENT (adj));
gtk_widget_show (transslider); gtk_widget_show (transslider);
gtk_table_attach (GTK_TABLE (table), transslider, 0, 1, 0, 1, gtk_table_attach (GTK_TABLE (table), transslider, 0, 1, 0, 1,
@ -408,7 +408,7 @@ void DoConfigDialog ()
gtk_misc_set_alignment (GTK_MISC (translabel), 0.0, 0.0); gtk_misc_set_alignment (GTK_MISC (translabel), 0.0, 0.0);
gtk_signal_connect (adj, "value_changed", GTK_SIGNAL_FUNC (OnScrollTrans), translabel); gtk_signal_connect (adj, "value_changed", GTK_SIGNAL_FUNC (OnScrollTrans), translabel);
adj = gtk_adjustment_new (portals.clip_range, 1, 128, 1, 1, 1); adj = gtk_adjustment_new (portals.clip_range, 1, 128, 1, 1, 0);
clipslider = gtk_hscale_new (GTK_ADJUSTMENT (adj)); clipslider = gtk_hscale_new (GTK_ADJUSTMENT (adj));
gtk_widget_show (clipslider); gtk_widget_show (clipslider);
gtk_table_attach (GTK_TABLE (table), clipslider, 0, 1, 1, 2, gtk_table_attach (GTK_TABLE (table), clipslider, 0, 1, 1, 2,
@ -451,7 +451,7 @@ void DoConfigDialog ()
gtk_widget_show (hbox); gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, FALSE, 0);
adj = gtk_adjustment_new (portals.width_2d, 2, 40, 1, 1, 1); adj = gtk_adjustment_new (portals.width_2d, 2, 40, 1, 1, 0);
lw2slider = gtk_hscale_new (GTK_ADJUSTMENT (adj)); lw2slider = gtk_hscale_new (GTK_ADJUSTMENT (adj));
gtk_widget_show (lw2slider); gtk_widget_show (lw2slider);
gtk_box_pack_start (GTK_BOX (hbox), lw2slider, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), lw2slider, TRUE, TRUE, 0);

8
contrib/sunplug/sunplug.cpp
View File

@ -387,10 +387,10 @@ void MapCoordinator()
globalOutputStream() << "SunPlug: adviced mapcoordsmins=" << minX << " " << maxY << "\n"; // console info about mapcoordsmins globalOutputStream() << "SunPlug: adviced mapcoordsmins=" << minX << " " << maxY << "\n"; // console info about mapcoordsmins
globalOutputStream() << "SunPlug: adviced mapcoordsmaxs=" << maxX << " " << minY << "\n"; // console info about mapcoordsmaxs globalOutputStream() << "SunPlug: adviced mapcoordsmaxs=" << maxX << " " << minY << "\n"; // console info about mapcoordsmaxs
spinner_adj_MinX = (GtkAdjustment *)gtk_adjustment_new(map_minX, -65536.0, 65536.0, 1.0, 5.0, 5.0); // create adjustment for value and range of minimum x value spinner_adj_MinX = (GtkAdjustment *)gtk_adjustment_new(map_minX, -65536.0, 65536.0, 1.0, 5.0, 0); // create adjustment for value and range of minimum x value
spinner_adj_MinY = (GtkAdjustment *)gtk_adjustment_new(map_minY, -65536.0, 65536.0, 1.0, 5.0, 5.0); // create adjustment for value and range of minimum y value spinner_adj_MinY = (GtkAdjustment *)gtk_adjustment_new(map_minY, -65536.0, 65536.0, 1.0, 5.0, 0); // create adjustment for value and range of minimum y value
spinner_adj_MaxX = (GtkAdjustment *)gtk_adjustment_new(map_maxX, -65536.0, 65536.0, 1.0, 5.0, 5.0); // create adjustment for value and range of maximum x value spinner_adj_MaxX = (GtkAdjustment *)gtk_adjustment_new(map_maxX, -65536.0, 65536.0, 1.0, 5.0, 0); // create adjustment for value and range of maximum x value
spinner_adj_MaxY = (GtkAdjustment *)gtk_adjustment_new(map_maxY, -65536.0, 65536.0, 1.0, 5.0, 5.0); // create adjustment for value and range of maximum y value spinner_adj_MaxY = (GtkAdjustment *)gtk_adjustment_new(map_maxY, -65536.0, 65536.0, 1.0, 5.0, 0); // create adjustment for value and range of maximum y value
button = gtk_button_new_with_label("Get optimal mapcoords"); // create button with text button = gtk_button_new_with_label("Get optimal mapcoords"); // create button with text
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(input_optimal), NULL); // connect button with callback function g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(input_optimal), NULL); // connect button with callback function

4
radiant/camwindow.cpp
View File

@ -1967,9 +1967,9 @@ typedef FreeCaller1<const IntImportCallback&, RenderModeExport> RenderModeExport
void Camera_constructPreferences(PreferencesPage& page) void Camera_constructPreferences(PreferencesPage& page)
{ {
page.appendSlider("Movement Speed", g_camwindow_globals_private.m_nMoveSpeed, TRUE, 0, 0, 100, MIN_CAM_SPEED, MAX_CAM_SPEED, 1, 10, 10); page.appendSlider("Movement Speed", g_camwindow_globals_private.m_nMoveSpeed, TRUE, 0, 0, 100, MIN_CAM_SPEED, MAX_CAM_SPEED, 1, 10);
page.appendCheckBox("", "Link strafe speed to movement speed", g_camwindow_globals_private.m_bCamLinkSpeed); page.appendCheckBox("", "Link strafe speed to movement speed", g_camwindow_globals_private.m_bCamLinkSpeed);
page.appendSlider("Rotation Speed", g_camwindow_globals_private.m_nAngleSpeed, TRUE, 0, 0, 3, 1, 180, 1, 10, 10); page.appendSlider("Rotation Speed", g_camwindow_globals_private.m_nAngleSpeed, TRUE, 0, 0, 3, 1, 180, 1, 10);
page.appendCheckBox("", "Invert mouse vertical axis", g_camwindow_globals_private.m_bCamInverseMouse); page.appendCheckBox("", "Invert mouse vertical axis", g_camwindow_globals_private.m_bCamInverseMouse);
page.appendCheckBox( page.appendCheckBox(
"", "Discrete movement", "", "Discrete movement",

6
radiant/dialog.cpp
View File

@ -96,7 +96,7 @@ GtkSpinButton* DialogSpinner_new(double value, double lower, double upper, int f
{ {
++digits; ++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_show(GTK_WIDGET(spin));
gtk_widget_set_size_request(GTK_WIDGET(spin), 64, -1); gtk_widget_set_size_request(GTK_WIDGET(spin), 64, -1);
return spin; return spin;
@ -591,7 +591,7 @@ void Dialog::addCombo(GtkWidget* vbox, const char* name, int& data, StringArrayR
addCombo(vbox, name, values, IntImportCaller(data), IntExportCaller(data)); 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 0
if(draw_value == FALSE) if(draw_value == FALSE)
@ -613,7 +613,7 @@ void Dialog::addSlider(GtkWidget* vbox, const char* name, int& data, gboolean dr
#endif #endif
// adjustment // 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)); AddIntAdjustmentData(*GTK_ADJUSTMENT(adj), IntImportCaller(data), IntExportCaller(data));
// scale // scale

2
radiant/dialog.h
View File

@ -154,7 +154,7 @@ public:
GtkWidget* addCheckBox(GtkWidget* vbox, const char* name, const char* flag, bool& data); GtkWidget* addCheckBox(GtkWidget* vbox, const char* name, const char* flag, bool& data);
void addCombo(GtkWidget* vbox, const char* name, StringArrayRange values, const IntImportCallback& importCallback, const IntExportCallback& exportCallback); void addCombo(GtkWidget* vbox, const char* name, StringArrayRange values, const IntImportCallback& importCallback, const IntExportCallback& exportCallback);
void addCombo(GtkWidget* vbox, const char* name, int& data, StringArrayRange values); void addCombo(GtkWidget* vbox, const char* name, int& data, StringArrayRange values);
void 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 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);
void addRadio(GtkWidget* vbox, const char* name, StringArrayRange names, const IntImportCallback& importCallback, const IntExportCallback& exportCallback); void addRadio(GtkWidget* vbox, const char* name, StringArrayRange names, const IntImportCallback& importCallback, const IntExportCallback& exportCallback);
void addRadio(GtkWidget* vbox, const char* name, int& data, StringArrayRange names); void addRadio(GtkWidget* vbox, const char* name, int& data, StringArrayRange names);
void addRadioIcons(GtkWidget* vbox, const char* name, StringArrayRange icons, const IntImportCallback& importCallback, const IntExportCallback& exportCallback); void addRadioIcons(GtkWidget* vbox, const char* name, StringArrayRange icons, const IntImportCallback& importCallback, const IntExportCallback& exportCallback);

10
radiant/patchdialog.cpp
View File

@ -937,7 +937,7 @@ GtkWindow* PatchInspector::BuildDialog()
// so we need to have at least one initialisation somewhere // so we need to have at least one initialisation somewhere
entry_set_float(entry, g_pi_globals.shift[0]); entry_set_float(entry, g_pi_globals.shift[0]);
GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 1, 1, 1)); GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 1, 1, 0));
g_signal_connect(G_OBJECT(adj), "value_changed", G_CALLBACK(OnSpinChanged), entry); g_signal_connect(G_OBJECT(adj), "value_changed", G_CALLBACK(OnSpinChanged), entry);
g_object_set_data(G_OBJECT(window), "hshift_adj", adj); g_object_set_data(G_OBJECT(window), "hshift_adj", adj);
@ -958,7 +958,7 @@ GtkWindow* PatchInspector::BuildDialog()
gtk_widget_set_usize(GTK_WIDGET(entry), 50, -2); gtk_widget_set_usize(GTK_WIDGET(entry), 50, -2);
entry_set_float(entry, g_pi_globals.shift[1]); entry_set_float(entry, g_pi_globals.shift[1]);
GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 1, 1, 1)); GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 1, 1, 0));
g_signal_connect(G_OBJECT(adj), "value_changed", G_CALLBACK(OnSpinChanged), entry); g_signal_connect(G_OBJECT(adj), "value_changed", G_CALLBACK(OnSpinChanged), entry);
g_object_set_data(G_OBJECT(window), "vshift_adj", adj); g_object_set_data(G_OBJECT(window), "vshift_adj", adj);
@ -979,7 +979,7 @@ GtkWindow* PatchInspector::BuildDialog()
gtk_widget_set_usize(GTK_WIDGET(entry), 50, -2); gtk_widget_set_usize(GTK_WIDGET(entry), 50, -2);
entry_set_float(entry, g_pi_globals.scale[0]); entry_set_float(entry, g_pi_globals.scale[0]);
GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -1000, 1000, 1, 1, 1)); GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -1000, 1000, 1, 1, 0));
g_signal_connect(G_OBJECT(adj), "value_changed", G_CALLBACK(OnSpinChanged), entry); g_signal_connect(G_OBJECT(adj), "value_changed", G_CALLBACK(OnSpinChanged), entry);
g_object_set_data(G_OBJECT(window), "hscale_adj", adj); g_object_set_data(G_OBJECT(window), "hscale_adj", adj);
@ -1000,7 +1000,7 @@ GtkWindow* PatchInspector::BuildDialog()
gtk_widget_set_usize(GTK_WIDGET(entry), 50, -2); gtk_widget_set_usize(GTK_WIDGET(entry), 50, -2);
entry_set_float(entry, g_pi_globals.scale[1]); entry_set_float(entry, g_pi_globals.scale[1]);
GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -1000, 1000, 1, 1, 1)); GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -1000, 1000, 1, 1, 0));
g_signal_connect(G_OBJECT(adj), "value_changed", G_CALLBACK(OnSpinChanged), entry); g_signal_connect(G_OBJECT(adj), "value_changed", G_CALLBACK(OnSpinChanged), entry);
g_object_set_data(G_OBJECT(window), "vscale_adj", adj); g_object_set_data(G_OBJECT(window), "vscale_adj", adj);
@ -1021,7 +1021,7 @@ GtkWindow* PatchInspector::BuildDialog()
gtk_widget_set_usize(GTK_WIDGET(entry), 50, -2); gtk_widget_set_usize(GTK_WIDGET(entry), 50, -2);
entry_set_float(entry, g_pi_globals.rotate); entry_set_float(entry, g_pi_globals.rotate);
GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -1000, 1000, 1, 1, 1)); // NOTE: Arnout - this really should be 360 but can't change it anymore as it could break existing maps GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -1000, 1000, 1, 1, 0)); // NOTE: Arnout - this really should be 360 but can't change it anymore as it could break existing maps
g_signal_connect(G_OBJECT(adj), "value_changed", G_CALLBACK(OnSpinChanged), entry); g_signal_connect(G_OBJECT(adj), "value_changed", G_CALLBACK(OnSpinChanged), entry);
g_object_set_data(G_OBJECT(window), "rotate_adj", adj); g_object_set_data(G_OBJECT(window), "rotate_adj", adj);

4
radiant/preferences.h
View File

@ -60,9 +60,9 @@ public:
{ {
m_dialog.addCombo(m_vbox, name, data, values); m_dialog.addCombo(m_vbox, name, data, values);
} }
void appendSlider(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 appendSlider(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)
{ {
m_dialog.addSlider(m_vbox, name, data, draw_value, low, high, value, lower, upper, step_increment, page_increment, page_size); m_dialog.addSlider(m_vbox, name, data, draw_value, low, high, value, lower, upper, step_increment, page_increment);
} }
void appendRadio(const char* name, StringArrayRange names, const IntImportCallback& importCallback, const IntExportCallback& exportCallback) void appendRadio(const char* name, StringArrayRange names, const IntImportCallback& importCallback, const IntExportCallback& exportCallback)
{ {

6
radiant/select.cpp
View File

@ -1051,7 +1051,7 @@ void DoRotateDlg()
(GtkAttachOptions) (0), 0, 0); (GtkAttachOptions) (0), 0, 0);
} }
{ {
GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -359, 359, 1, 10, 10)); GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -359, 359, 1, 10, 0));
GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(adj, 1, 0)); GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(adj, 1, 0));
gtk_widget_show(GTK_WIDGET(spin)); gtk_widget_show(GTK_WIDGET(spin));
gtk_table_attach(table, GTK_WIDGET(spin), 1, 2, 0, 1, gtk_table_attach(table, GTK_WIDGET(spin), 1, 2, 0, 1,
@ -1065,7 +1065,7 @@ void DoRotateDlg()
g_rotate_dialog.x = spin; g_rotate_dialog.x = spin;
} }
{ {
GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -359, 359, 1, 10, 10)); GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -359, 359, 1, 10, 0));
GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(adj, 1, 0)); GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(adj, 1, 0));
gtk_widget_show(GTK_WIDGET(spin)); gtk_widget_show(GTK_WIDGET(spin));
gtk_table_attach(table, GTK_WIDGET(spin), 1, 2, 1, 2, gtk_table_attach(table, GTK_WIDGET(spin), 1, 2, 1, 2,
@ -1077,7 +1077,7 @@ void DoRotateDlg()
g_rotate_dialog.y = spin; g_rotate_dialog.y = spin;
} }
{ {
GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -359, 359, 1, 10, 10)); GtkAdjustment* adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, -359, 359, 1, 10, 0));
GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(adj, 1, 0)); GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(adj, 1, 0));
gtk_widget_show(GTK_WIDGET(spin)); gtk_widget_show(GTK_WIDGET(spin));
gtk_table_attach(table, GTK_WIDGET(spin), 1, 2, 2, 3, gtk_table_attach(table, GTK_WIDGET(spin), 1, 2, 2, 3,

14
radiant/surfacedialog.cpp
View File

@ -697,7 +697,7 @@ GtkWindow* SurfaceInspector::BuildDialog()
(GtkAttachOptions) (0), 0, 0); (GtkAttachOptions) (0), 0, 0);
} }
{ {
GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 2, 8, 8)), 0, 2)); GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 2, 8, 0)), 0, 2));
m_hshiftIncrement.m_spin = spin; m_hshiftIncrement.m_spin = spin;
m_hshiftSpinner.connect(spin); m_hshiftSpinner.connect(spin);
gtk_widget_show(GTK_WIDGET(spin)); gtk_widget_show(GTK_WIDGET(spin));
@ -733,7 +733,7 @@ GtkWindow* SurfaceInspector::BuildDialog()
(GtkAttachOptions) (0), 0, 0); (GtkAttachOptions) (0), 0, 0);
} }
{ {
GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 2, 8, 8)), 0, 2)); GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 2, 8, 0)), 0, 2));
m_vshiftIncrement.m_spin = spin; m_vshiftIncrement.m_spin = spin;
m_vshiftSpinner.connect(spin); m_vshiftSpinner.connect(spin);
gtk_widget_show(GTK_WIDGET(spin)); gtk_widget_show(GTK_WIDGET(spin));
@ -769,7 +769,7 @@ GtkWindow* SurfaceInspector::BuildDialog()
(GtkAttachOptions) (0), 0, 0); (GtkAttachOptions) (0), 0, 0);
} }
{ {
GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 2, 8, 8)), 0, 5)); GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 2, 8, 0)), 0, 5));
m_hscaleIncrement.m_spin = spin; m_hscaleIncrement.m_spin = spin;
m_hscaleSpinner.connect(spin); m_hscaleSpinner.connect(spin);
gtk_widget_show(GTK_WIDGET(spin)); gtk_widget_show(GTK_WIDGET(spin));
@ -805,7 +805,7 @@ GtkWindow* SurfaceInspector::BuildDialog()
(GtkAttachOptions) (0), 0, 0); (GtkAttachOptions) (0), 0, 0);
} }
{ {
GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 2, 8, 8)), 0, 5)); GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 2, 8, 0)), 0, 5));
m_vscaleIncrement.m_spin = spin; m_vscaleIncrement.m_spin = spin;
m_vscaleSpinner.connect(spin); m_vscaleSpinner.connect(spin);
gtk_widget_show(GTK_WIDGET(spin)); gtk_widget_show(GTK_WIDGET(spin));
@ -841,7 +841,7 @@ GtkWindow* SurfaceInspector::BuildDialog()
(GtkAttachOptions) (0), 0, 0); (GtkAttachOptions) (0), 0, 0);
} }
{ {
GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 2, 8, 8)), 0, 2)); GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(0, -8192, 8192, 2, 8, 0)), 0, 2));
m_rotateIncrement.m_spin = spin; m_rotateIncrement.m_spin = spin;
m_rotateSpinner.connect(spin); m_rotateSpinner.connect(spin);
gtk_widget_show(GTK_WIDGET(spin)); gtk_widget_show(GTK_WIDGET(spin));
@ -980,7 +980,7 @@ GtkWindow* SurfaceInspector::BuildDialog()
gtk_widget_set_usize (button, 60, -2); gtk_widget_set_usize (button, 60, -2);
} }
{ {
GtkWidget* spin = gtk_spin_button_new (GTK_ADJUSTMENT (gtk_adjustment_new (1, 0, 1 << 16, 1, 10, 10)), 0, 6); GtkWidget* spin = gtk_spin_button_new (GTK_ADJUSTMENT (gtk_adjustment_new (1, 0, 1 << 16, 1, 10, 0)), 0, 6);
gtk_widget_show (spin); gtk_widget_show (spin);
gtk_table_attach(GTK_TABLE(table), spin, 2, 3, 1, 2, gtk_table_attach(GTK_TABLE(table), spin, 2, 3, 1, 2,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
@ -989,7 +989,7 @@ GtkWindow* SurfaceInspector::BuildDialog()
AddDialogData(*GTK_SPIN_BUTTON(spin), m_fitHorizontal); AddDialogData(*GTK_SPIN_BUTTON(spin), m_fitHorizontal);
} }
{ {
GtkWidget* spin = gtk_spin_button_new (GTK_ADJUSTMENT (gtk_adjustment_new (1, 0, 1 << 16, 1, 10, 10)), 0, 6); GtkWidget* spin = gtk_spin_button_new (GTK_ADJUSTMENT (gtk_adjustment_new (1, 0, 1 << 16, 1, 10, 0)), 0, 6);
gtk_widget_show (spin); gtk_widget_show (spin);
gtk_table_attach(GTK_TABLE(table), spin, 3, 4, 1, 2, gtk_table_attach(GTK_TABLE(table), spin, 3, 4, 1, 2,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),

2
radiant/texwindow.cpp
View File

@ -2085,7 +2085,7 @@ GtkWidget* TextureBrowser_constructWindow(GtkWindow* toplevel)
gtk_widget_show(GTK_WIDGET(g_TextureBrowser.m_treeViewTree)); gtk_widget_show(GTK_WIDGET(g_TextureBrowser.m_treeViewTree));
} }
{ // gl_widget scrollbar { // gl_widget scrollbar
GtkWidget* w = gtk_vscrollbar_new(GTK_ADJUSTMENT(gtk_adjustment_new (0,0,0,1,1,1))); GtkWidget* w = gtk_vscrollbar_new(GTK_ADJUSTMENT(gtk_adjustment_new (0,0,0,1,1,0)));
gtk_table_attach(GTK_TABLE (table), w, 2, 3, 1, 2, GTK_SHRINK, GTK_FILL, 0, 0); gtk_table_attach(GTK_TABLE (table), w, 2, 3, 1, 2, GTK_SHRINK, GTK_FILL, 0, 0);
gtk_widget_show(w); gtk_widget_show(w);
g_TextureBrowser.m_texture_scroll = w; g_TextureBrowser.m_texture_scroll = w;