From 2dad85b84f780cde7effe4858d35d9892e93de8d Mon Sep 17 00:00:00 2001 From: Ell Date: Sat, 9 Mar 2019 06:55:58 -0500 Subject: [PATCH] libgimpwidgets, app, plug-ins: use GimpSpinButton everywhere Replace all direct uses of GtkSpinButton with GimpSpinButton, so that its modified behavior extends to all our spin buttons. --- app/dialogs/convert-indexed-dialog.c | 2 +- app/dialogs/layer-options-dialog.c | 4 ++-- app/dialogs/offset-dialog.c | 2 +- app/dialogs/print-size-dialog.c | 8 ++++---- app/dialogs/resize-dialog.c | 2 +- app/display/gimpdisplayshell-rotate-dialog.c | 2 +- app/display/gimpdisplayshell-scale-dialog.c | 6 +++--- app/tools/gimpgradienttool-editor.c | 2 +- app/tools/gimprectangleoptions.c | 2 +- app/tools/gimprotatetool.c | 4 ++-- app/widgets/gimpcolormapeditor.c | 4 ++-- app/widgets/gimphistogrambox.c | 4 ++-- app/widgets/gimppaletteeditor.c | 2 +- app/widgets/gimpspinscale.c | 2 +- app/widgets/gimpspinscale.h | 4 ++-- app/widgets/gimptemplateeditor.c | 8 ++++---- app/widgets/gimptextstyleeditor.c | 8 ++++---- libgimpwidgets/gimpmemsizeentry.c | 3 ++- libgimpwidgets/gimppropwidgets.c | 3 ++- libgimpwidgets/gimpquerybox.c | 5 +++-- libgimpwidgets/gimpscaleentry.c | 3 ++- libgimpwidgets/gimpwidgets.c | 8 ++++---- plug-ins/common/curve-bend.c | 2 +- plug-ins/common/file-gbr.c | 2 +- plug-ins/common/file-gih.c | 12 ++++++------ plug-ins/common/file-html-table.c | 6 +++--- plug-ins/common/file-mng.c | 2 +- plug-ins/common/file-pdf-load.c | 4 ++-- plug-ins/common/file-ps.c | 16 ++++++++-------- plug-ins/common/file-svg.c | 6 +++--- plug-ins/common/file-wmf.c | 6 +++--- plug-ins/common/file-xbm.c | 4 ++-- plug-ins/common/file-xmc.c | 6 +++--- plug-ins/common/film.c | 4 ++-- plug-ins/common/sample-colorize.c | 10 +++++----- plug-ins/common/smooth-palette.c | 2 +- plug-ins/common/unit-editor.c | 4 ++-- plug-ins/common/web-page.c | 2 +- plug-ins/file-dds/ddswrite.c | 6 +++--- plug-ins/file-fli/fli-gimp.c | 8 ++++---- plug-ins/file-jpeg/jpeg-save.c | 2 +- plug-ins/file-webp/file-webp-dialog.c | 4 ++-- plug-ins/ifs-compose/ifs-compose.c | 2 +- plug-ins/imagemap/imap_table.c | 2 +- plug-ins/lighting/lighting-ui.c | 4 ++-- plug-ins/map-object/map-object-ui.c | 4 ++-- plug-ins/print/print-page-layout.c | 12 ++++++------ plug-ins/screenshot/screenshot.c | 4 ++-- plug-ins/script-fu/script-fu-interface.c | 6 +++--- plug-ins/ui/plug-in-file-gif.ui | 2 +- plug-ins/ui/plug-in-file-png.ui | 2 +- 51 files changed, 119 insertions(+), 115 deletions(-) diff --git a/app/dialogs/convert-indexed-dialog.c b/app/dialogs/convert-indexed-dialog.c index c3685aeb83..3259190c5d 100644 --- a/app/dialogs/convert-indexed-dialog.c +++ b/app/dialogs/convert-indexed-dialog.c @@ -200,7 +200,7 @@ convert_indexed_dialog_new (GimpImage *image, adjustment = (GtkAdjustment *) gtk_adjustment_new (private->max_colors, 2, 256, 1, 8, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 0); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_label_set_mnemonic_widget (GTK_LABEL (label), spinbutton); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c index 4c89967e5b..3c9b52b1ec 100644 --- a/app/dialogs/layer-options-dialog.c +++ b/app/dialogs/layer-options-dialog.c @@ -264,7 +264,7 @@ layer_options_dialog_new (GimpImage *image, /* The size sizeentry */ adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 2); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); @@ -328,7 +328,7 @@ layer_options_dialog_new (GimpImage *image, /* The offset sizeentry */ adjustment = (GtkAdjustment *) gtk_adjustment_new (0, 1, 1, 1, 10, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 2); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c index 887daf7c7c..b7c2773e48 100644 --- a/app/dialogs/offset-dialog.c +++ b/app/dialogs/offset-dialog.c @@ -170,7 +170,7 @@ offset_dialog_new (GimpDrawable *drawable, adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 2); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); diff --git a/app/dialogs/print-size-dialog.c b/app/dialogs/print-size-dialog.c index 126e13bdc2..e3b9ba0c34 100644 --- a/app/dialogs/print-size-dialog.c +++ b/app/dialogs/print-size-dialog.c @@ -158,12 +158,12 @@ print_size_dialog_new (GimpImage *image, /* the print size entry */ adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - width = gtk_spin_button_new (adj, 1.0, 2); + width = gimp_spin_button_new (adj, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (width), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (width), SB_WIDTH); adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - height = gtk_spin_button_new (adj, 1.0, 2); + height = gimp_spin_button_new (adj, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (height), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (height), SB_WIDTH); @@ -224,12 +224,12 @@ print_size_dialog_new (GimpImage *image, /* the resolution entry */ adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - width = gtk_spin_button_new (adj, 1.0, 2); + width = gimp_spin_button_new (adj, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (width), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (width), SB_WIDTH); adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - height = gtk_spin_button_new (adj, 1.0, 2); + height = gimp_spin_button_new (adj, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (height), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (height), SB_WIDTH); diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c index 7278fb7953..722f8a80b2 100644 --- a/app/dialogs/resize-dialog.c +++ b/app/dialogs/resize-dialog.c @@ -237,7 +237,7 @@ resize_dialog_new (GimpViewable *viewable, /* the offset sizeentry */ adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 2); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH); diff --git a/app/display/gimpdisplayshell-rotate-dialog.c b/app/display/gimpdisplayshell-rotate-dialog.c index e50acedde7..c8992356dc 100644 --- a/app/display/gimpdisplayshell-rotate-dialog.c +++ b/app/display/gimpdisplayshell-rotate-dialog.c @@ -157,7 +157,7 @@ gimp_display_shell_rotate_dialog (GimpDisplayShell *shell) data->rotate_adj = (GtkAdjustment *) gtk_adjustment_new (shell->rotate_angle, 0.0, 360.0, 1, 15, 0); - spin = gtk_spin_button_new (data->rotate_adj, 1.0, 2); + spin = gimp_spin_button_new (data->rotate_adj, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin), TRUE); gtk_entry_set_activates_default (GTK_ENTRY (spin), TRUE); diff --git a/app/display/gimpdisplayshell-scale-dialog.c b/app/display/gimpdisplayshell-scale-dialog.c index 26d7e8f43b..f3d2eabe3b 100644 --- a/app/display/gimpdisplayshell-scale-dialog.c +++ b/app/display/gimpdisplayshell-scale-dialog.c @@ -166,7 +166,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell) data->num_adj = (GtkAdjustment *) gtk_adjustment_new (num, 1, 256, 1, 8, 0); - spin = gtk_spin_button_new (data->num_adj, 1.0, 0); + spin = gimp_spin_button_new (data->num_adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE); gtk_entry_set_activates_default (GTK_ENTRY (spin), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spin, TRUE, TRUE, 0); @@ -178,7 +178,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell) data->denom_adj = (GtkAdjustment *) gtk_adjustment_new (denom, 1, 256, 1, 8, 0); - spin = gtk_spin_button_new (data->denom_adj, 1.0, 0); + spin = gimp_spin_button_new (data->denom_adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE); gtk_entry_set_activates_default (GTK_ENTRY (spin), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spin, TRUE, TRUE, 0); @@ -193,7 +193,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell) gtk_adjustment_new (fabs (shell->other_scale) * 100, 100.0 / 256.0, 25600.0, 10, 50, 0); - spin = gtk_spin_button_new (data->scale_adj, 1.0, 2); + spin = gimp_spin_button_new (data->scale_adj, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE); gtk_entry_set_activates_default (GTK_ENTRY (spin), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spin, TRUE, TRUE, 0); diff --git a/app/tools/gimpgradienttool-editor.c b/app/tools/gimpgradienttool-editor.c index 9de33b2e4a..ad4528b9b1 100644 --- a/app/tools/gimpgradienttool-editor.c +++ b/app/tools/gimpgradienttool-editor.c @@ -1296,7 +1296,7 @@ gimp_gradient_tool_editor_init_endpoint_gui (GimpGradientTool *gradient_tool) gtk_widget_show (label); /* the position size entry */ - spinbutton = gtk_spin_button_new_with_range (0.0, 0.0, 1.0); + spinbutton = gimp_spin_button_new_with_range (0.0, 0.0, 1.0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 6); diff --git a/app/tools/gimprectangleoptions.c b/app/tools/gimprectangleoptions.c index 547cee5e4a..cb7f96cdf5 100644 --- a/app/tools/gimprectangleoptions.c +++ b/app/tools/gimprectangleoptions.c @@ -790,7 +790,7 @@ gimp_rectangle_options_prop_dimension_frame_new (GObject *config, gtk_widget_show (hbox); adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 0); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH); diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c index b7785b8d7d..519ee3e134 100644 --- a/app/tools/gimprotatetool.c +++ b/app/tools/gimprotatetool.c @@ -274,7 +274,7 @@ gimp_rotate_tool_dialog (GimpTransformGridTool *tg_tool) rotate->angle_adj = (GtkAdjustment *) gtk_adjustment_new (0, -180, 180, 0.1, 15, 0); - button = gtk_spin_button_new (rotate->angle_adj, 1.0, 2); + button = gimp_spin_button_new (rotate->angle_adj, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (button), TRUE); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (button), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH); @@ -293,7 +293,7 @@ gimp_rotate_tool_dialog (GimpTransformGridTool *tg_tool) gtk_widget_show (scale); adj = (GtkAdjustment *) gtk_adjustment_new (0, -1, 1, 1, 10, 0); - button = gtk_spin_button_new (adj, 1.0, 2); + button = gimp_spin_button_new (adj, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (button), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Center _X:"), diff --git a/app/widgets/gimpcolormapeditor.c b/app/widgets/gimpcolormapeditor.c index 6ff67be003..e6c6c00bb5 100644 --- a/app/widgets/gimpcolormapeditor.c +++ b/app/widgets/gimpcolormapeditor.c @@ -202,8 +202,8 @@ gimp_colormap_editor_init (GimpColormapEditor *editor) editor->index_adjustment = (GtkAdjustment *) gtk_adjustment_new (0, 0, 0, 1, 10, 0); - editor->index_spinbutton = gtk_spin_button_new (editor->index_adjustment, - 1.0, 0); + editor->index_spinbutton = gimp_spin_button_new (editor->index_adjustment, + 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (editor->index_spinbutton), TRUE); diff --git a/app/widgets/gimphistogrambox.c b/app/widgets/gimphistogrambox.c index d9197b19c8..f2d291b871 100644 --- a/app/widgets/gimphistogrambox.c +++ b/app/widgets/gimphistogrambox.c @@ -143,7 +143,7 @@ gimp_histogram_box_init (GimpHistogramBox *box) /* low spinbutton */ box->low_adj = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 255.0, 1.0, 16.0, 0.0); - box->low_spinbutton = gtk_spin_button_new (box->low_adj, 1.0, 0); + box->low_spinbutton = gimp_spin_button_new (box->low_adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (box->low_spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), box->low_spinbutton, FALSE, FALSE, 0); gtk_widget_show (box->low_spinbutton); @@ -158,7 +158,7 @@ gimp_histogram_box_init (GimpHistogramBox *box) /* high spinbutton */ box->high_adj = (GtkAdjustment *) gtk_adjustment_new (255.0, 0.0, 255.0, 1.0, 16.0, 0.0); - box->high_spinbutton = gtk_spin_button_new (box->high_adj, 1.0, 0); + box->high_spinbutton = gimp_spin_button_new (box->high_adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (box->high_spinbutton), TRUE); gtk_box_pack_end (GTK_BOX (hbox), box->high_spinbutton, FALSE, FALSE, 0); gtk_widget_show (box->high_spinbutton); diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c index d21f3e8274..15fa5e50c8 100644 --- a/app/widgets/gimppaletteeditor.c +++ b/app/widgets/gimppaletteeditor.c @@ -261,7 +261,7 @@ gimp_palette_editor_init (GimpPaletteEditor *editor) editor->columns_adj = (GtkAdjustment *) gtk_adjustment_new (0, 0, 64, 1, 4, 0); - spinbutton = gtk_spin_button_new (editor->columns_adj, 1.0, 0); + spinbutton = gimp_spin_button_new (editor->columns_adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); diff --git a/app/widgets/gimpspinscale.c b/app/widgets/gimpspinscale.c index 31769a6693..361d4b9cf5 100644 --- a/app/widgets/gimpspinscale.c +++ b/app/widgets/gimpspinscale.c @@ -130,7 +130,7 @@ static void gimp_spin_scale_setup_mnemonic (GimpSpinScale *scale, G_DEFINE_TYPE_WITH_PRIVATE (GimpSpinScale, gimp_spin_scale, - GTK_TYPE_SPIN_BUTTON) + GIMP_TYPE_SPIN_BUTTON) #define parent_class gimp_spin_scale_parent_class diff --git a/app/widgets/gimpspinscale.h b/app/widgets/gimpspinscale.h index 0693ac2745..3b99da5e36 100644 --- a/app/widgets/gimpspinscale.h +++ b/app/widgets/gimpspinscale.h @@ -35,12 +35,12 @@ typedef struct _GimpSpinScaleClass GimpSpinScaleClass; struct _GimpSpinScale { - GtkSpinButton parent_instance; + GimpSpinButton parent_instance; }; struct _GimpSpinScaleClass { - GtkSpinButtonClass parent_class; + GimpSpinButtonClass parent_class; }; diff --git a/app/widgets/gimptemplateeditor.c b/app/widgets/gimptemplateeditor.c index 8d980c980d..82311f5cc5 100644 --- a/app/widgets/gimptemplateeditor.c +++ b/app/widgets/gimptemplateeditor.c @@ -182,12 +182,12 @@ gimp_template_editor_constructed (GObject *object) gtk_widget_show (table); adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - width = gtk_spin_button_new (adjustment, 1.0, 2); + width = gimp_spin_button_new (adjustment, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (width), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (width), SB_WIDTH); adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - height = gtk_spin_button_new (adjustment, 1.0, 2); + height = gimp_spin_button_new (adjustment, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (height), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (height), SB_WIDTH); @@ -311,12 +311,12 @@ gimp_template_editor_constructed (GObject *object) gtk_widget_show (table); adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - xres = gtk_spin_button_new (adjustment, 1.0, 2); + xres = gimp_spin_button_new (adjustment, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (xres), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (xres), SB_WIDTH); adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - yres = gtk_spin_button_new (adjustment, 1.0, 2); + yres = gimp_spin_button_new (adjustment, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (yres), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (yres), SB_WIDTH); diff --git a/app/widgets/gimptextstyleeditor.c b/app/widgets/gimptextstyleeditor.c index 5cc003c86a..3f942d4e01 100644 --- a/app/widgets/gimptextstyleeditor.c +++ b/app/widgets/gimptextstyleeditor.c @@ -263,8 +263,8 @@ gimp_text_style_editor_init (GimpTextStyleEditor *editor) editor->kerning_adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, -1000.0, 1000.0, 1.0, 10.0, 0.0)); - editor->kerning_spinbutton = gtk_spin_button_new (editor->kerning_adjustment, - 1.0, 1); + editor->kerning_spinbutton = + gimp_spin_button_new (editor->kerning_adjustment, 1.0, 1); gtk_entry_set_width_chars (GTK_ENTRY (editor->kerning_spinbutton), 5); gtk_box_pack_end (GTK_BOX (editor->lower_hbox), editor->kerning_spinbutton, FALSE, FALSE, 0); @@ -279,8 +279,8 @@ gimp_text_style_editor_init (GimpTextStyleEditor *editor) editor->baseline_adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, -1000.0, 1000.0, 1.0, 10.0, 0.0)); - editor->baseline_spinbutton = gtk_spin_button_new (editor->baseline_adjustment, - 1.0, 1); + editor->baseline_spinbutton = + gimp_spin_button_new (editor->baseline_adjustment, 1.0, 1); gtk_entry_set_width_chars (GTK_ENTRY (editor->baseline_spinbutton), 5); gtk_box_pack_end (GTK_BOX (editor->lower_hbox), editor->baseline_spinbutton, FALSE, FALSE, 0); diff --git a/libgimpwidgets/gimpmemsizeentry.c b/libgimpwidgets/gimpmemsizeentry.c index fd3c98d99c..282454b1d8 100644 --- a/libgimpwidgets/gimpmemsizeentry.c +++ b/libgimpwidgets/gimpmemsizeentry.c @@ -27,6 +27,7 @@ #include "gimpwidgetstypes.h" #include "gimpmemsizeentry.h" +#include "gimpspinbutton.h" #include "gimpwidgets.h" #include "libgimp/libgimp-intl.h" @@ -200,7 +201,7 @@ gimp_memsize_entry_new (guint64 value, CAST (upper >> shift), 1, 8, 0); - entry->spinbutton = gtk_spin_button_new (adj, 1.0, 0); + entry->spinbutton = gimp_spin_button_new (adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (entry->spinbutton), TRUE); #undef CAST diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c index 73f4855b8d..4304a9e3b6 100644 --- a/libgimpwidgets/gimppropwidgets.c +++ b/libgimpwidgets/gimppropwidgets.c @@ -34,6 +34,7 @@ #undef GIMP_DISABLE_DEPRECATED #include "gimpoldwidgets.h" #include "gimppropwidgets.h" +#include "gimpspinbutton.h" #include "gimpunitmenu.h" #define GIMP_DISABLE_DEPRECATED @@ -1281,7 +1282,7 @@ gimp_prop_spin_button_new (GObject *config, gtk_adjustment_new (value, lower, upper, step_increment, page_increment, 0); - spinbutton = gtk_spin_button_new (adjustment, step_increment, digits); + spinbutton = gimp_spin_button_new (adjustment, step_increment, digits); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); set_param_spec (G_OBJECT (adjustment), spinbutton, param_spec); diff --git a/libgimpwidgets/gimpquerybox.c b/libgimpwidgets/gimpquerybox.c index 17bfbbb390..f26e60924b 100644 --- a/libgimpwidgets/gimpquerybox.c +++ b/libgimpwidgets/gimpquerybox.c @@ -32,6 +32,7 @@ #include "gimppixmap.h" #include "gimpquerybox.h" #include "gimpsizeentry.h" +#include "gimpspinbutton.h" #include "gimpwidgets.h" #include "libgimp/libgimp-intl.h" @@ -340,7 +341,7 @@ gimp_query_int_box (const gchar *title, adjustment = (GtkAdjustment *) gtk_adjustment_new (initial, lower, upper, 1, 10, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 0); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_activates_default (GTK_ENTRY (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (query_box->vbox), spinbutton, FALSE, FALSE, 0); @@ -404,7 +405,7 @@ gimp_query_double_box (const gchar *title, adjustment = (GtkAdjustment *) gtk_adjustment_new (initial, lower, upper, 1, 10, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 0); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_activates_default (GTK_ENTRY (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (query_box->vbox), spinbutton, FALSE, FALSE, 0); diff --git a/libgimpwidgets/gimpscaleentry.c b/libgimpwidgets/gimpscaleentry.c index 3fb893b7c3..759d62c49c 100644 --- a/libgimpwidgets/gimpscaleentry.c +++ b/libgimpwidgets/gimpscaleentry.c @@ -28,6 +28,7 @@ #include "libgimpmath/gimpmath.h" #include "libgimpbase/gimpbase.h" +#include "gimpspinbutton.h" #include "gimpwidgets.h" @@ -159,7 +160,7 @@ gimp_scale_entry_new_internal (gboolean color_scale, G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - spinbutton = gtk_spin_button_new (spin_adjustment, step_increment, digits); + spinbutton = gimp_spin_button_new (spin_adjustment, step_increment, digits); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_widget_show (spinbutton); diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c index 99f3f7db56..2958de99a2 100644 --- a/libgimpwidgets/gimpwidgets.c +++ b/libgimpwidgets/gimpwidgets.c @@ -450,8 +450,8 @@ gimp_spin_button_new (GtkObject **adjustment, /* return value */ *adjustment = gtk_adjustment_new (value, lower, upper, step_increment, page_increment, 0); - spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (*adjustment), - climb_rate, digits); + spinbutton = gimp_spin_button_new (GTK_ADJUSTMENT (*adjustment), + climb_rate, digits); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); @@ -508,7 +508,7 @@ gimp_random_seed_new (guint *seed, adj = (GtkAdjustment *) gtk_adjustment_new (*seed, 0, (guint32) -1, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1.0, 0); + spinbutton = gimp_spin_button_new (adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); @@ -741,7 +741,7 @@ gimp_coordinates_new (GimpUnit unit, GtkWidget *chainbutton; adjustment = (GtkAdjustment *) gtk_adjustment_new (1, 0, 1, 1, 10, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 2); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); if (spinbutton_width > 0) diff --git a/plug-ins/common/curve-bend.c b/plug-ins/common/curve-bend.c index f2a5e01ce5..7886f5e850 100644 --- a/plug-ins/common/curve-bend.c +++ b/plug-ins/common/curve-bend.c @@ -1326,7 +1326,7 @@ bender_new_dialog (GimpDrawable *drawable) cd->rotate_data = GTK_ADJUSTMENT (gtk_adjustment_new (0, 0.0, 360.0, 1, 45, 0)); gtk_adjustment_set_value (cd->rotate_data, cd->rotation); - spinbutton = gtk_spin_button_new (cd->rotate_data, 0.5, 1); + spinbutton = gimp_spin_button_new (cd->rotate_data, 0.5, 1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c index a8319508c0..c66d1d5ebd 100644 --- a/plug-ins/common/file-gbr.c +++ b/plug-ins/common/file-gbr.c @@ -337,7 +337,7 @@ save_dialog (void) info.description); adj = (GtkAdjustment *) gtk_adjustment_new (info.spacing, 1, 1000, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1.0, 0); + spinbutton = gimp_spin_button_new (adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_activates_default (GTK_ENTRY (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c index 3d4b56a397..244ee5d295 100644 --- a/plug-ins/common/file-gih.c +++ b/plug-ins/common/file-gih.c @@ -558,7 +558,7 @@ gih_save_dialog (gint32 image_ID) */ adjustment = (GtkAdjustment *) gtk_adjustment_new (info.spacing, 1, 1000, 1, 10, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 0); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Spacing (percent):"), 0.0, 0.5, @@ -576,7 +576,7 @@ gih_save_dialog (gint32 image_ID) adjustment = (GtkAdjustment *) gtk_adjustment_new (gihparams.cellwidth, 2, gimp_image_width (image_ID), 1, 10, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 0); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (box), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); @@ -600,7 +600,7 @@ gih_save_dialog (gint32 image_ID) adjustment = (GtkAdjustment *) gtk_adjustment_new (gihparams.cellheight, 2, gimp_image_height (image_ID), 1, 10, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 0); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (box), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); @@ -631,7 +631,7 @@ gih_save_dialog (gint32 image_ID) */ adjustment = (GtkAdjustment *) gtk_adjustment_new (gihparams.ncells, 1, 1000, 1, 10, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 0); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Number of cells:"), 0.0, 0.5, @@ -692,7 +692,7 @@ gih_save_dialog (gint32 image_ID) */ adjustment = (GtkAdjustment *) gtk_adjustment_new (gihparams.dim, 1, GIMP_PIXPIPE_MAXDIM, 1, 1, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 0); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 5, _("Dimension:"), 0.0, 0.5, @@ -714,7 +714,7 @@ gih_save_dialog (gint32 image_ID) adjustment = (GtkAdjustment *) gtk_adjustment_new (gihparams.rank[i], 1, 100, 1, 1, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 0); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_table_attach (GTK_TABLE (dimtable), spinbutton, 0, 1, i, i + 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); diff --git a/plug-ins/common/file-html-table.c b/plug-ins/common/file-html-table.c index c4c03dffcd..0af9eb3b0c 100644 --- a/plug-ins/common/file-html-table.c +++ b/plug-ins/common/file-html-table.c @@ -626,7 +626,7 @@ save_dialog (gint32 image_ID) adj = (GtkAdjustment *) gtk_adjustment_new (gtmvals.border, 0, 1000, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1.0, 0); + spinbutton = gimp_spin_button_new (adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("_Border:"), 0.0, 0.5, @@ -674,7 +674,7 @@ save_dialog (gint32 image_ID) adj = (GtkAdjustment *) gtk_adjustment_new (gtmvals.cellpadding, 0, 1000, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1.0, 0); + spinbutton = gimp_spin_button_new (adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Cell-_padding:"), 0.0, 0.5, @@ -689,7 +689,7 @@ save_dialog (gint32 image_ID) adj = (GtkAdjustment *) gtk_adjustment_new (gtmvals.cellspacing, 0, 1000, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1.0, 0); + spinbutton = gimp_spin_button_new (adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 4, _("Cell-_spacing:"), 0.0, 0.5, diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c index de1bf3a3d0..508db98407 100644 --- a/plug-ins/common/file-mng.c +++ b/plug-ins/common/file-mng.c @@ -1532,7 +1532,7 @@ mng_save_dialog (gint32 image_id) spinbutton_adj = (GtkAdjustment *) gtk_adjustment_new (mng_data.default_delay, 0, 65000, 10, 100, 0); - spinbutton = gtk_spin_button_new (spinbutton_adj, 1.0, 0); + spinbutton = gimp_spin_button_new (spinbutton_adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); g_signal_connect (spinbutton_adj, "value-changed", diff --git a/plug-ins/common/file-pdf-load.c b/plug-ins/common/file-pdf-load.c index 382be85004..8e90250b71 100644 --- a/plug-ins/common/file-pdf-load.c +++ b/plug-ins/common/file-pdf-load.c @@ -1552,8 +1552,8 @@ gimp_resolution_entry_field_init (GimpResolutionEntry *gre, gref->min_value, gref->max_value, 1.0, 10.0, 0.0); - gref->spinbutton = gtk_spin_button_new (gref->adjustment, - 1.0, digits); + gref->spinbutton = gimp_spin_button_new (gref->adjustment, + 1.0, digits); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (gref->spinbutton), TRUE); if (spinbutton_width > 0) diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c index cf5cbb6fc8..73e8912c32 100644 --- a/plug-ins/common/file-ps.c +++ b/plug-ins/common/file-ps.c @@ -3451,7 +3451,7 @@ load_dialog (const gchar *filename) adj = (GtkAdjustment *) gtk_adjustment_new (plvals.resolution, MIN_RESOLUTION, MAX_RESOLUTION, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1.0, 0); + spinbutton = gimp_spin_button_new (adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Resolution:"), 0.0, 0.5, @@ -3467,7 +3467,7 @@ load_dialog (const gchar *filename) adj = (GtkAdjustment *) gtk_adjustment_new (plvals.width, 1, GIMP_MAX_IMAGE_SIZE, 1, 10, 0); - ps_width_spinbutton = gtk_spin_button_new (adj, 1.0, 0); + ps_width_spinbutton = gimp_spin_button_new (adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("_Width:"), 0.0, 0.5, @@ -3480,7 +3480,7 @@ load_dialog (const gchar *filename) adj = (GtkAdjustment *) gtk_adjustment_new (plvals.height, 1, GIMP_MAX_IMAGE_SIZE, 1, 10, 0); - ps_height_spinbutton = gtk_spin_button_new (adj, 1.0, 0); + ps_height_spinbutton = gimp_spin_button_new (adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("_Height:"), 0.0, 0.5, @@ -3672,7 +3672,7 @@ save_dialog (void) vals->adjustment[0] = (GtkAdjustment *) gtk_adjustment_new (psvals.width, 1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0); - spinbutton = gtk_spin_button_new (vals->adjustment[0], 1.0, 2); + spinbutton = gimp_spin_button_new (vals->adjustment[0], 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("_Width:"), 0.0, 0.5, @@ -3684,7 +3684,7 @@ save_dialog (void) vals->adjustment[1] = (GtkAdjustment *) gtk_adjustment_new (psvals.height, 1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0); - spinbutton = gtk_spin_button_new (vals->adjustment[1], 1.0, 2); + spinbutton = gimp_spin_button_new (vals->adjustment[1], 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("_Height:"), 0.0, 0.5, @@ -3696,7 +3696,7 @@ save_dialog (void) vals->adjustment[2] = (GtkAdjustment *) gtk_adjustment_new (psvals.x_offset, 0.0, GIMP_MAX_IMAGE_SIZE, 1, 10, 0); - spinbutton = gtk_spin_button_new (vals->adjustment[2], 1.0, 2); + spinbutton = gimp_spin_button_new (vals->adjustment[2], 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("_X offset:"), 0.0, 0.5, @@ -3708,7 +3708,7 @@ save_dialog (void) vals->adjustment[3] = (GtkAdjustment *) gtk_adjustment_new (psvals.y_offset, 0.0, GIMP_MAX_IMAGE_SIZE, 1, 10, 0); - spinbutton = gtk_spin_button_new (vals->adjustment[3], 1.0, 2); + spinbutton = gimp_spin_button_new (vals->adjustment[3], 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("_Y offset:"), 0.0, 0.5, @@ -3809,7 +3809,7 @@ save_dialog (void) adj = (GtkAdjustment *) gtk_adjustment_new (psvals.preview_size, 0, 1024, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1.0, 0); + spinbutton = gimp_spin_button_new (adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Preview _size:"), 1.0, 0.5, diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c index ba6dd0a253..570b3632b1 100644 --- a/plug-ins/common/file-svg.c +++ b/plug-ins/common/file-svg.c @@ -802,7 +802,7 @@ load_dialog (const gchar *filename, gtk_widget_show (hbox); adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1.0, 2); + spinbutton = gimp_spin_button_new (adj, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); @@ -856,7 +856,7 @@ load_dialog (const gchar *filename, (gdouble) GIMP_MIN_IMAGE_SIZE / (gdouble) svg_width, (gdouble) GIMP_MAX_IMAGE_SIZE / (gdouble) svg_width, 0.01, 0.1, 0); - spinbutton = gtk_spin_button_new (xadj, 0.01, 4); + spinbutton = gimp_spin_button_new (xadj, 0.01, 4); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 0, 1); @@ -878,7 +878,7 @@ load_dialog (const gchar *filename, (gdouble) GIMP_MIN_IMAGE_SIZE / (gdouble) svg_height, (gdouble) GIMP_MAX_IMAGE_SIZE / (gdouble) svg_height, 0.01, 0.1, 0); - spinbutton = gtk_spin_button_new (yadj, 0.01, 4); + spinbutton = gimp_spin_button_new (yadj, 0.01, 4); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 1, 2); diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c index 6391cf0ae4..8c865109e1 100644 --- a/plug-ins/common/file-wmf.c +++ b/plug-ins/common/file-wmf.c @@ -596,7 +596,7 @@ load_dialog (const gchar *filename) gtk_widget_show (hbox); adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1.0, 2); + spinbutton = gimp_spin_button_new (adj, 1.0, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); @@ -650,7 +650,7 @@ load_dialog (const gchar *filename) (gdouble) GIMP_MIN_IMAGE_SIZE / (gdouble) wmf_width, (gdouble) GIMP_MAX_IMAGE_SIZE / (gdouble) wmf_width, 0.01, 0.1, 0); - spinbutton = gtk_spin_button_new (xadj, 0.01, 4); + spinbutton = gimp_spin_button_new (xadj, 0.01, 4); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 0, 1); @@ -672,7 +672,7 @@ load_dialog (const gchar *filename) (gdouble) GIMP_MIN_IMAGE_SIZE / (gdouble) wmf_height, (gdouble) GIMP_MAX_IMAGE_SIZE / (gdouble) wmf_height, 0.01, 0.1, 0); - spinbutton = gtk_spin_button_new (yadj, 0.01, 4); + spinbutton = gimp_spin_button_new (yadj, 0.01, 4); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10); gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 1, 2); diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c index 9a5749777c..5ab3b00d86 100644 --- a/plug-ins/common/file-xbm.c +++ b/plug-ins/common/file-xbm.c @@ -1325,7 +1325,7 @@ save_dialog (gint32 drawable_ID) gtk_adjustment_new (xsvals.x_hot, 0, gimp_drawable_width (drawable_ID) - 1, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1.0, 0); + spinbutton = gimp_spin_button_new (adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Hot spot _X:"), 0.0, 0.5, @@ -1339,7 +1339,7 @@ save_dialog (gint32 drawable_ID) gtk_adjustment_new (xsvals.y_hot, 0, gimp_drawable_height (drawable_ID) - 1, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1.0, 0); + spinbutton = gimp_spin_button_new (adj, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Hot spot _Y:"), 0.0, 0.5, diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c index 7631353651..a5c41f7c19 100644 --- a/plug-ins/common/file-xmc.c +++ b/plug-ins/common/file-xmc.c @@ -1094,7 +1094,7 @@ save_dialog (const gint32 image_ID, adjustment = (GtkAdjustment *) gtk_adjustment_new (xmcparas.x, x1, x2, 1, 5, 0); - tmpwidget = gtk_spin_button_new (adjustment, 1.0, 0); + tmpwidget = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (tmpwidget), TRUE); g_value_set_double (&val, 1.0); g_object_set_property (G_OBJECT (tmpwidget), "xalign", &val);/* align right*/ @@ -1117,7 +1117,7 @@ save_dialog (const gint32 image_ID, adjustment = (GtkAdjustment *) gtk_adjustment_new (xmcparas.y, y1, y2, 1, 5, 0); - tmpwidget = gtk_spin_button_new (adjustment, 1.0, 0); + tmpwidget = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (tmpwidget), TRUE); g_value_set_double (&val, 1.0); g_object_set_property (G_OBJECT (tmpwidget), "xalign", &val);/* align right*/ @@ -1223,7 +1223,7 @@ save_dialog (const gint32 image_ID, adjustment = (GtkAdjustment *) gtk_adjustment_new (xmcvals.delay, CURSOR_MINIMUM_DELAY, CURSOR_MAX_DELAY, 1, 5, 0); - tmpwidget = gtk_spin_button_new (adjustment, 1.0, 0); + tmpwidget = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (tmpwidget), TRUE); g_value_set_double (&val, 1.0); g_object_set_property (G_OBJECT (tmpwidget), "xalign", &val);/* align right*/ diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index 8f1f4a0e21..dbc7240008 100644 --- a/plug-ins/common/film.c +++ b/plug-ins/common/film.c @@ -1001,7 +1001,7 @@ create_selection_tab (GtkWidget *notebook, /* Film height */ adj = GTK_ADJUSTMENT (gtk_adjustment_new (filmvals.film_height, 10, GIMP_MAX_IMAGE_SIZE, 1, 10, 0)); - spinbutton = gtk_spin_button_new (adj, 1, 0); + spinbutton = gimp_spin_button_new (adj, 1, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, @@ -1060,7 +1060,7 @@ create_selection_tab (GtkWidget *notebook, /* Startindex */ adj = GTK_ADJUSTMENT (gtk_adjustment_new (filmvals.number_start, 0, GIMP_MAX_IMAGE_SIZE, 1, 10, 0)); - spinbutton = gtk_spin_button_new (adj, 1, 0); + spinbutton = gimp_spin_button_new (adj, 1, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, diff --git a/plug-ins/common/sample-colorize.c b/plug-ins/common/sample-colorize.c index 46bdce0c8c..989d720875 100644 --- a/plug-ins/common/sample-colorize.c +++ b/plug-ins/common/sample-colorize.c @@ -1568,7 +1568,7 @@ smp_dialog (void) data = gtk_adjustment_new ((gfloat)g_values.lvl_in_min, 0.0, 254.0, 1, 10, 0); g_di.adj_lvl_in_min = GTK_ADJUSTMENT (data); - spinbutton = gtk_spin_button_new (g_di.adj_lvl_in_min, 0.5, 0); + spinbutton = gimp_spin_button_new (g_di.adj_lvl_in_min, 0.5, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); @@ -1581,7 +1581,7 @@ smp_dialog (void) data = gtk_adjustment_new ((gfloat)g_values.lvl_in_gamma, 0.1, 10.0, 0.02, 0.2, 0); g_di.adj_lvl_in_gamma = GTK_ADJUSTMENT (data); - spinbutton = gtk_spin_button_new (g_di.adj_lvl_in_gamma, 0.5, 2); + spinbutton = gimp_spin_button_new (g_di.adj_lvl_in_gamma, 0.5, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); @@ -1594,7 +1594,7 @@ smp_dialog (void) data = gtk_adjustment_new ((gfloat)g_values.lvl_in_max, 1.0, 255.0, 1, 10, 0); g_di.adj_lvl_in_max = GTK_ADJUSTMENT (data); - spinbutton = gtk_spin_button_new (g_di.adj_lvl_in_max, 0.5, 0); + spinbutton = gimp_spin_button_new (g_di.adj_lvl_in_max, 0.5, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); @@ -1619,7 +1619,7 @@ smp_dialog (void) data = gtk_adjustment_new ((gfloat)g_values.lvl_out_min, 0.0, 254.0, 1, 10, 0); g_di.adj_lvl_out_min = GTK_ADJUSTMENT (data); - spinbutton = gtk_spin_button_new (g_di.adj_lvl_out_min, 0.5, 0); + spinbutton = gimp_spin_button_new (g_di.adj_lvl_out_min, 0.5, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); @@ -1632,7 +1632,7 @@ smp_dialog (void) data = gtk_adjustment_new ((gfloat)g_values.lvl_out_max, 0.0, 255.0, 1, 10, 0); g_di.adj_lvl_out_max = GTK_ADJUSTMENT (data); - spinbutton = gtk_spin_button_new (g_di.adj_lvl_out_max, 0.5, 0); + spinbutton = gimp_spin_button_new (g_di.adj_lvl_out_max, 0.5, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); diff --git a/plug-ins/common/smooth-palette.c b/plug-ins/common/smooth-palette.c index 5b75e3a41e..e6916b5b90 100644 --- a/plug-ins/common/smooth-palette.c +++ b/plug-ins/common/smooth-palette.c @@ -471,7 +471,7 @@ dialog (gint32 drawable_id) adj = GTK_ADJUSTMENT (gtk_adjustment_new (config.ntries, 1, 1024, 1, 10, 0)); - spinbutton = gtk_spin_button_new (adj, 1, 0); + spinbutton = gimp_spin_button_new (adj, 1, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (sizeentry), 0, 2, diff --git a/plug-ins/common/unit-editor.c b/plug-ins/common/unit-editor.c index 85a9b3945c..4156fe683f 100644 --- a/plug-ins/common/unit-editor.c +++ b/plug-ins/common/unit-editor.c @@ -241,7 +241,7 @@ new_unit_dialog (GtkWidget *main_dialog, gimp_unit_get_factor (template) : 1.0, GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION, 0.01, 0.1, 0.0); - spinbutton = gtk_spin_button_new (factor_adj, 0.01, 5); + spinbutton = gimp_spin_button_new (factor_adj, 0.01, 5); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("_Factor:"), 0.0, 0.5, @@ -253,7 +253,7 @@ new_unit_dialog (GtkWidget *main_dialog, gtk_adjustment_new ((template != GIMP_UNIT_PIXEL) ? gimp_unit_get_digits (template) : 2.0, 0, 5, 1, 1, 0); - spinbutton = gtk_spin_button_new (digits_adj, 0, 0); + spinbutton = gimp_spin_button_new (digits_adj, 0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("_Digits:"), 0.0, 0.5, diff --git a/plug-ins/common/web-page.c b/plug-ins/common/web-page.c index d570386807..3ceef8af62 100644 --- a/plug-ins/common/web-page.c +++ b/plug-ins/common/web-page.c @@ -294,7 +294,7 @@ webpage_dialog (void) adjustment = (GtkAdjustment *) gtk_adjustment_new (webpagevals.width, 1, 8192, 1, 10, 0); - spinbutton = gtk_spin_button_new (adjustment, 1.0, 0); + spinbutton = gimp_spin_button_new (adjustment, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); gtk_widget_show (spinbutton); diff --git a/plug-ins/file-dds/ddswrite.c b/plug-ins/file-dds/ddswrite.c index 58733904e1..d3ec960790 100644 --- a/plug-ins/file-dds/ddswrite.c +++ b/plug-ins/file-dds/ddswrite.c @@ -2006,7 +2006,7 @@ save_dialog (gint32 image_id, G_CALLBACK (transindex_clicked), 0); gtk_widget_show (check); - spin = gtk_spin_button_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 255, 1, 1, 0)), 1, 0); + spin = gimp_spin_button_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 255, 1, 1, 0)), 1, 0); gtk_box_pack_start (GTK_BOX (hbox), spin, 1, 1, 0); gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (spin), GTK_UPDATE_IF_VALID); @@ -2154,7 +2154,7 @@ save_dialog (gint32 image_id, (GtkAttachOptions)(0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); - spin = gtk_spin_button_new (GTK_ADJUSTMENT (gtk_adjustment_new (dds_write_vals.gamma, 1e-05, 100, 0.1, 0.5, 0)), 1, 1); + spin = gimp_spin_button_new (GTK_ADJUSTMENT (gtk_adjustment_new (dds_write_vals.gamma, 1e-05, 100, 0.1, 0.5, 0)), 1, 1); gtk_table_attach (GTK_TABLE (table), spin, 1, 2, 4, 5, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND), 0, 0); @@ -2183,7 +2183,7 @@ save_dialog (gint32 image_id, (GtkAttachOptions)(0), 0, 0); gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); - spin = gtk_spin_button_new (GTK_ADJUSTMENT (gtk_adjustment_new (dds_write_vals.alpha_test_threshold, 0, 1, 0.01, 0.1, 0)), 1, 2); + spin = gimp_spin_button_new (GTK_ADJUSTMENT (gtk_adjustment_new (dds_write_vals.alpha_test_threshold, 0, 1, 0.01, 0.1, 0)), 1, 2); gtk_table_attach (GTK_TABLE (table), spin, 1, 2, 6, 7, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND), 0, 0); diff --git a/plug-ins/file-fli/fli-gimp.c b/plug-ins/file-fli/fli-gimp.c index 45d2a8cdfc..335edd54f4 100644 --- a/plug-ins/file-fli/fli-gimp.c +++ b/plug-ins/file-fli/fli-gimp.c @@ -897,7 +897,7 @@ load_dialog (const gchar *filename) * But for now you can set a start- and a end-frame: */ adj = (GtkAdjustment *) gtk_adjustment_new (from_frame, 1, nframes, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1, 0); + spinbutton = gimp_spin_button_new (adj, 1, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, C_("frame-range", "From:"), 0.0, 0.5, @@ -907,7 +907,7 @@ load_dialog (const gchar *filename) &from_frame); adj = (GtkAdjustment *) gtk_adjustment_new (to_frame, 1, nframes, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1, 0); + spinbutton = gimp_spin_button_new (adj, 1, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, C_("frame-range", "To:"), 0.0, 0.5, @@ -955,7 +955,7 @@ save_dialog (gint32 image_id) * But for now you can set a start- and a end-frame: */ adj = (GtkAdjustment *) gtk_adjustment_new (from_frame, 1, nframes, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1, 0); + spinbutton = gimp_spin_button_new (adj, 1, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, C_("frame-range", "From:"), 0.0, 0.5, @@ -965,7 +965,7 @@ save_dialog (gint32 image_id) &from_frame); adj = (GtkAdjustment *) gtk_adjustment_new (to_frame, 1, nframes, 1, 10, 0); - spinbutton = gtk_spin_button_new (adj, 1, 0); + spinbutton = gimp_spin_button_new (adj, 1, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, C_("frame-range", "To:"), 0.0, 0.5, diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c index c9d29d4e52..c04f43706f 100644 --- a/plug-ins/file-jpeg/jpeg-save.c +++ b/plug-ins/file-jpeg/jpeg-save.c @@ -1016,7 +1016,7 @@ save_dialog (void) DEFAULT_RESTART_MCU_ROWS : jsvals.restart), 1.0, 64.0, 1.0, 1.0, 0); pg.restart = restart_markers_scale = spinbutton = - gtk_spin_button_new (pg.scale_data, 1.0, 0); + gimp_spin_button_new (pg.scale_data, 1.0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_table_attach (GTK_TABLE (table), spinbutton, 5, 6, 1, 2, GTK_FILL, GTK_FILL, 0, 0); diff --git a/plug-ins/file-webp/file-webp-dialog.c b/plug-ins/file-webp/file-webp-dialog.c index 73ca67d90e..2194e2bdf8 100644 --- a/plug-ins/file-webp/file-webp-dialog.c +++ b/plug-ins/file-webp/file-webp-dialog.c @@ -279,7 +279,7 @@ save_dialog (WebPSaveParams *params, adj_kf = (GtkAdjustment *) gtk_adjustment_new (params->kf_distance, 0.0, 10000.0, 1.0, 10.0, 0.0); - kf_distance = gtk_spin_button_new (adj_kf, 1, 0); + kf_distance = gimp_spin_button_new (adj_kf, 1, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (kf_distance), TRUE); gtk_box_pack_start (GTK_BOX (hbox_kf), kf_distance, FALSE, FALSE, 0); gtk_widget_show (kf_distance); @@ -336,7 +336,7 @@ save_dialog (WebPSaveParams *params, /* default delay */ adj = (GtkAdjustment *) gtk_adjustment_new (params->delay, 1, 10000, 1, 10, 0); - delay = gtk_spin_button_new (adj, 1, 0); + delay = gimp_spin_button_new (adj, 1, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (delay), TRUE); gtk_box_pack_start (GTK_BOX (hbox), delay, FALSE, FALSE, 0); gtk_widget_show (delay); diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c index 62202d1db3..27cad9c02d 100644 --- a/plug-ins/ifs-compose/ifs-compose.c +++ b/plug-ins/ifs-compose/ifs-compose.c @@ -2108,7 +2108,7 @@ value_pair_create (gpointer data, (upper - lower) / 100, (upper - lower) / 10, 0.0); - value_pair->spin = gtk_spin_button_new (value_pair->adjustment, 1.0, 3); + value_pair->spin = gimp_spin_button_new (value_pair->adjustment, 1.0, 3); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (value_pair->spin), TRUE); gtk_widget_set_size_request (value_pair->spin, 72, -1); diff --git a/plug-ins/imagemap/imap_table.c b/plug-ins/imagemap/imap_table.c index 84c35a0de6..d72a478cdf 100644 --- a/plug-ins/imagemap/imap_table.c +++ b/plug-ins/imagemap/imap_table.c @@ -40,7 +40,7 @@ create_spin_button_in_table(GtkWidget *table, GtkWidget *label, int row, int col, int value, int min, int max) { GtkObject *adj = gtk_adjustment_new(value, min, max, 1, 10, 0); - GtkWidget *button = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1, 0); + GtkWidget *button = gimp_spin_button_new(GTK_ADJUSTMENT(adj), 1, 0); gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(button), TRUE); if (label) gtk_label_set_mnemonic_widget(GTK_LABEL(label), button); diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c index 5756c888f3..775633233a 100644 --- a/plug-ins/lighting/lighting-ui.c +++ b/plug-ins/lighting/lighting-ui.c @@ -1548,8 +1548,8 @@ spin_button_new (GtkAdjustment **adjustment, /* return value */ gtk_adjustment_new (value, lower, upper, step_increment, page_increment, 0); - spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (*adjustment), - climb_rate, digits); + spinbutton = gimp_spin_button_new (GTK_ADJUSTMENT (*adjustment), + climb_rate, digits); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); diff --git a/plug-ins/map-object/map-object-ui.c b/plug-ins/map-object/map-object-ui.c index 148720bea5..218451f682 100644 --- a/plug-ins/map-object/map-object-ui.c +++ b/plug-ins/map-object/map-object-ui.c @@ -404,8 +404,8 @@ spin_button_new (GtkAdjustment **adjustment, /* return value */ gtk_adjustment_new (value, lower, upper, step_increment, page_increment, 0); - spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (*adjustment), - climb_rate, digits); + spinbutton = gimp_spin_button_new (GTK_ADJUSTMENT (*adjustment), + climb_rate, digits); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); diff --git a/plug-ins/print/print-page-layout.c b/plug-ins/print/print-page-layout.c index afa196d32f..1fb91dedff 100644 --- a/plug-ins/print/print-page-layout.c +++ b/plug-ins/print/print-page-layout.c @@ -271,7 +271,7 @@ print_size_frame (PrintData *data, gtk_table_set_col_spacing (GTK_TABLE (entry), 2, 6); adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - height = gtk_spin_button_new (adj, 1, 2); + height = gimp_spin_button_new (adj, 1, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (height), TRUE); gimp_size_entry_add_field (GIMP_SIZE_ENTRY (entry), GTK_SPIN_BUTTON (height), NULL); @@ -315,7 +315,7 @@ print_size_frame (PrintData *data, gtk_table_set_col_spacing (GTK_TABLE (entry), 2, 6); adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - height = gtk_spin_button_new (adj, 1, 2); + height = gimp_spin_button_new (adj, 1, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (height), TRUE); gimp_size_entry_add_field (GIMP_SIZE_ENTRY (entry), GTK_SPIN_BUTTON (height), NULL); @@ -402,7 +402,7 @@ print_offset_frame (PrintData *data, /* left */ info.left_adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - spinner = gtk_spin_button_new (info.left_adj, 1, 2); + spinner = gimp_spin_button_new (info.left_adj, 1, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinner), TRUE); gimp_size_entry_add_field (GIMP_SIZE_ENTRY (entry), @@ -419,7 +419,7 @@ print_offset_frame (PrintData *data, /* right */ info.right_adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - spinner = gtk_spin_button_new (info.right_adj, 1, 2); + spinner = gimp_spin_button_new (info.right_adj, 1, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinner), TRUE); g_signal_connect (info.right_adj, "value-changed", @@ -439,7 +439,7 @@ print_offset_frame (PrintData *data, /* top */ info.top_adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - spinner = gtk_spin_button_new (info.top_adj, 1, 2); + spinner = gimp_spin_button_new (info.top_adj, 1, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinner), TRUE); gimp_size_entry_add_field (GIMP_SIZE_ENTRY (entry), @@ -456,7 +456,7 @@ print_offset_frame (PrintData *data, /* bottom */ info.bottom_adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0); - spinner = gtk_spin_button_new (info.bottom_adj, 1, 2); + spinner = gimp_spin_button_new (info.bottom_adj, 1, 2); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinner), TRUE); g_signal_connect (info.bottom_adj, "value-changed", diff --git a/plug-ins/screenshot/screenshot.c b/plug-ins/screenshot/screenshot.c index 774f9bb225..63947b3689 100644 --- a/plug-ins/screenshot/screenshot.c +++ b/plug-ins/screenshot/screenshot.c @@ -697,7 +697,7 @@ shoot_dialog (GdkScreen **screen) adj = (GtkAdjustment *) gtk_adjustment_new (shootvals.select_delay, 0.0, 100.0, 1.0, 5.0, 0.0); - spinner = gtk_spin_button_new (adj, 0, 0); + spinner = gimp_spin_button_new (adj, 0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinner), TRUE); gtk_table_attach (GTK_TABLE (table), spinner, 1, 2, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0); @@ -760,7 +760,7 @@ shoot_dialog (GdkScreen **screen) adj = (GtkAdjustment *) gtk_adjustment_new (shootvals.screenshot_delay, 0.0, 100.0, 1.0, 5.0, 0.0); - spinner = gtk_spin_button_new (adj, 0, 0); + spinner = gimp_spin_button_new (adj, 0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinner), TRUE); gtk_table_attach (GTK_TABLE (table), spinner, 1, 2, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0); diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c index efb95aaf35..7a47c5819c 100644 --- a/plug-ins/script-fu/script-fu-interface.c +++ b/plug-ins/script-fu/script-fu-interface.c @@ -437,9 +437,9 @@ script_fu_interface (SFScript *script, arg->default_value.sfa_adjustment.step, arg->default_value.sfa_adjustment.page, 0); - widget = gtk_spin_button_new (arg->value.sfa_adjustment.adj, - arg->default_value.sfa_adjustment.step, - arg->default_value.sfa_adjustment.digits); + widget = gimp_spin_button_new (arg->value.sfa_adjustment.adj, + arg->default_value.sfa_adjustment.step, + arg->default_value.sfa_adjustment.digits); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (widget), TRUE); gtk_entry_set_activates_default (GTK_ENTRY (widget), TRUE); break; diff --git a/plug-ins/ui/plug-in-file-gif.ui b/plug-ins/ui/plug-in-file-gif.ui index f47eb1b54b..8d4f84154f 100644 --- a/plug-ins/ui/plug-in-file-gif.ui +++ b/plug-ins/ui/plug-in-file-gif.ui @@ -167,7 +167,7 @@ - + True True diff --git a/plug-ins/ui/plug-in-file-png.ui b/plug-ins/ui/plug-in-file-png.ui index dc03030eb4..9925d51398 100644 --- a/plug-ins/ui/plug-in-file-png.ui +++ b/plug-ins/ui/plug-in-file-png.ui @@ -157,7 +157,7 @@ - + True True True