[gimp] libgimpwidgets, app, plug-ins: use GimpSpinButton everywhere



commit 8954d1f386f6fb6cd263ee0ddf4a6c770e123ac2
Author: Ell <ell_se yahoo com>
Date:   Sat Mar 9 07:25:19 2019 -0500

    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            |  2 +-
 libgimpwidgets/gimppropwidgets.c             |  2 +-
 libgimpwidgets/gimpquerybox.c                |  9 ++-------
 libgimpwidgets/gimpscaleentry.c              |  2 +-
 libgimpwidgets/gimpwidgets.c                 |  4 ++--
 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/tile-small.c                 |  2 +-
 plug-ins/common/unit-editor.c                |  4 ++--
 plug-ins/common/warp.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_ui_grid.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 +-
 53 files changed, 116 insertions(+), 121 deletions(-)
---
diff --git a/app/dialogs/convert-indexed-dialog.c b/app/dialogs/convert-indexed-dialog.c
index 7ca775e1d1..446ff63c26 100644
--- a/app/dialogs/convert-indexed-dialog.c
+++ b/app/dialogs/convert-indexed-dialog.c
@@ -199,7 +199,7 @@ convert_indexed_dialog_new (GimpImage                  *image,
     private->max_colors = 255;
 
   adjustment = 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 02c339c504..e18d571496 100644
--- a/app/dialogs/layer-options-dialog.c
+++ b/app/dialogs/layer-options-dialog.c
@@ -261,7 +261,7 @@ layer_options_dialog_new (GimpImage                *image,
 
       /*  The size sizeentry  */
       adjustment = 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);
 
@@ -318,7 +318,7 @@ layer_options_dialog_new (GimpImage                *image,
 
   /*  The offset sizeentry  */
   adjustment = 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 9d3a95501b..696349f131 100644
--- a/app/dialogs/offset-dialog.c
+++ b/app/dialogs/offset-dialog.c
@@ -169,7 +169,7 @@ offset_dialog_new (GimpDrawable       *drawable,
   gtk_widget_show (vbox);
 
   adjustment = 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 55736e9813..f7d788f911 100644
--- a/app/dialogs/print-size-dialog.c
+++ b/app/dialogs/print-size-dialog.c
@@ -155,12 +155,12 @@ print_size_dialog_new (GimpImage              *image,
   /*  the print size entry  */
 
   adj = 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 = 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);
 
@@ -216,12 +216,12 @@ print_size_dialog_new (GimpImage              *image,
   /*  the resolution entry  */
 
   adj = 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 = 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 7d60a9788f..b3b42c9543 100644
--- a/app/dialogs/resize-dialog.c
+++ b/app/dialogs/resize-dialog.c
@@ -236,7 +236,7 @@ resize_dialog_new (GimpViewable       *viewable,
 
   /*  the offset sizeentry  */
   adjustment = 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 cb28c4980b..13fd0f5cdd 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 = 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 5d79e39eb1..ddc04724f1 100644
--- a/app/display/gimpdisplayshell-scale-dialog.c
+++ b/app/display/gimpdisplayshell-scale-dialog.c
@@ -165,7 +165,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell)
   gimp_zoom_model_get_fraction (data->model, &num, &denom);
 
   data->num_adj = 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);
@@ -176,7 +176,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell)
   gtk_widget_show (label);
 
   data->denom_adj = 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);
@@ -190,7 +190,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell)
   data->scale_adj = 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 43f943f495..4b17d61d0e 100644
--- a/app/tools/gimpgradienttool-editor.c
+++ b/app/tools/gimpgradienttool-editor.c
@@ -1294,7 +1294,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 2057514ae7..f35039adf5 100644
--- a/app/tools/gimprectangleoptions.c
+++ b/app/tools/gimprectangleoptions.c
@@ -793,7 +793,7 @@ gimp_rectangle_options_prop_dimension_frame_new (GObject      *config,
   gtk_widget_show (hbox);
 
   adjustment = 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);
   gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c
index b3152e0ac1..8e8c561f9b 100644
--- a/app/tools/gimprotatetool.c
+++ b/app/tools/gimprotatetool.c
@@ -272,7 +272,7 @@ gimp_rotate_tool_dialog (GimpTransformGridTool *tg_tool)
   gtk_widget_show (grid);
 
   rotate->angle_adj = 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);
@@ -292,7 +292,7 @@ gimp_rotate_tool_dialog (GimpTransformGridTool *tg_tool)
   gtk_widget_show (scale);
 
   adj = 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);
   gtk_widget_set_halign (button, GTK_ALIGN_START);
diff --git a/app/widgets/gimpcolormapeditor.c b/app/widgets/gimpcolormapeditor.c
index 441ac942f3..8040397a39 100644
--- a/app/widgets/gimpcolormapeditor.c
+++ b/app/widgets/gimpcolormapeditor.c
@@ -201,8 +201,8 @@ gimp_colormap_editor_init (GimpColormapEditor *editor)
   gtk_widget_show (grid);
 
   editor->index_adjustment = 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_widget_set_halign (editor->index_spinbutton, GTK_ALIGN_START);
   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 159df8e618..1cd930f12a 100644
--- a/app/widgets/gimphistogrambox.c
+++ b/app/widgets/gimphistogrambox.c
@@ -142,7 +142,7 @@ gimp_histogram_box_init (GimpHistogramBox *box)
 
   /*  low spinbutton  */
   box->low_adj = 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);
@@ -155,7 +155,7 @@ gimp_histogram_box_init (GimpHistogramBox *box)
 
   /*  high spinbutton  */
   box->high_adj = 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 be28222a7a..d9c334bf0a 100644
--- a/app/widgets/gimppaletteeditor.c
+++ b/app/widgets/gimppaletteeditor.c
@@ -268,7 +268,7 @@ gimp_palette_editor_init (GimpPaletteEditor *editor)
   gtk_widget_show (icon);
 
   editor->columns_adj = 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 2c350455f0..93a2a9bc93 100644
--- a/app/widgets/gimpspinscale.c
+++ b/app/widgets/gimpspinscale.c
@@ -131,7 +131,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 a0268f61ed..65e3191438 100644
--- a/app/widgets/gimptemplateeditor.c
+++ b/app/widgets/gimptemplateeditor.c
@@ -180,12 +180,12 @@ gimp_template_editor_constructed (GObject *object)
   gtk_widget_show (grid);
 
   adjustment = 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 = 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);
 
@@ -303,12 +303,12 @@ gimp_template_editor_constructed (GObject *object)
   gtk_widget_show (grid);
 
   adjustment = 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 = 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 cecd434b79..13e8462496 100644
--- a/app/widgets/gimptextstyleeditor.c
+++ b/app/widgets/gimptextstyleeditor.c
@@ -265,8 +265,8 @@ gimp_text_style_editor_init (GimpTextStyleEditor *editor)
 
   editor->kerning_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);
@@ -281,8 +281,8 @@ gimp_text_style_editor_init (GimpTextStyleEditor *editor)
 
   editor->baseline_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 e541ceb048..5aae6cbdd2 100644
--- a/libgimpwidgets/gimpmemsizeentry.c
+++ b/libgimpwidgets/gimpmemsizeentry.c
@@ -200,7 +200,7 @@ gimp_memsize_entry_new (guint64  value,
                                             CAST (upper >> shift),
                                             1, 8, 0);
 
-  private->spinbutton = gtk_spin_button_new (private->adjustment, 1.0, 0);
+  private->spinbutton = gimp_spin_button_new (private->adjustment, 1.0, 0);
   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (private->spinbutton), TRUE);
 
 #undef CAST
diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c
index 30b3677bdb..9570efd886 100644
--- a/libgimpwidgets/gimppropwidgets.c
+++ b/libgimpwidgets/gimppropwidgets.c
@@ -1232,7 +1232,7 @@ gimp_prop_spin_button_new (GObject     *config,
   adjustment = 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 71dc58f40a..31f9a0de04 100644
--- a/libgimpwidgets/gimpquerybox.c
+++ b/libgimpwidgets/gimpquerybox.c
@@ -26,11 +26,6 @@
 
 #include "libgimpbase/gimpbase.h"
 
-#include "gimpwidgetstypes.h"
-
-#include "gimpdialog.h"
-#include "gimpquerybox.h"
-#include "gimpsizeentry.h"
 #include "gimpwidgets.h"
 
 #include "libgimp/libgimp-intl.h"
@@ -338,7 +333,7 @@ gimp_query_int_box (const gchar          *title,
     return NULL;
 
   adjustment = 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);
@@ -401,7 +396,7 @@ gimp_query_double_box (const gchar             *title,
     return NULL;
 
   adjustment = 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 b7af871402..b230356166 100644
--- a/libgimpwidgets/gimpscaleentry.c
+++ b/libgimpwidgets/gimpscaleentry.c
@@ -156,7 +156,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 3361f9b1f8..d4effbeabb 100644
--- a/libgimpwidgets/gimpwidgets.c
+++ b/libgimpwidgets/gimpwidgets.c
@@ -458,7 +458,7 @@ gimp_random_seed_new (guint    *seed,
     *seed = g_random_int ();
 
   adj = 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);
@@ -694,7 +694,7 @@ gimp_coordinates_new (GimpUnit         unit,
   GtkWidget           *chainbutton;
 
   adjustment = 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 2878932c9e..9a08f70bab 100644
--- a/plug-ins/common/curve-bend.c
+++ b/plug-ins/common/curve-bend.c
@@ -1323,7 +1323,7 @@ bender_new_dialog (GimpDrawable *drawable)
   cd->rotate_data = 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 61e14ec49c..02476aa026 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 = 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_grid_attach_aligned (GTK_GRID (grid), 0, 1,
diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c
index 29ca08c8ed..2a490ac012 100644
--- a/plug-ins/common/file-gih.c
+++ b/plug-ins/common/file-gih.c
@@ -557,7 +557,7 @@ gih_save_dialog (gint32 image_ID)
    * Spacing: __
    */
   adjustment = 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_grid_attach_aligned (GTK_GRID (grid), 0, 1,
                             _("Spacing (percent):"), 0.0, 0.5,
@@ -574,7 +574,7 @@ gih_save_dialog (gint32 image_ID)
 
   adjustment = 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);
@@ -597,7 +597,7 @@ gih_save_dialog (gint32 image_ID)
 
   adjustment = 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);
@@ -627,7 +627,7 @@ gih_save_dialog (gint32 image_ID)
    * Number of cells: ___
    */
   adjustment = 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_grid_attach_aligned (GTK_GRID (grid), 0, 3,
                             _("Number of cells:"), 0.0, 0.5,
@@ -688,7 +688,7 @@ gih_save_dialog (gint32 image_ID)
    */
   adjustment = 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_grid_attach_aligned (GTK_GRID (grid), 0, 5,
                             _("Dimension:"), 0.0, 0.5,
@@ -709,7 +709,7 @@ gih_save_dialog (gint32 image_ID)
       gint j;
 
       adjustment = 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_grid_attach (GTK_GRID (dimgrid), spinbutton, 0, i, 1, 1);
 
diff --git a/plug-ins/common/file-html-table.c b/plug-ins/common/file-html-table.c
index b37a59c210..a596b252f1 100644
--- a/plug-ins/common/file-html-table.c
+++ b/plug-ins/common/file-html-table.c
@@ -624,7 +624,7 @@ save_dialog (gint32 image_ID)
   gtk_container_add (GTK_CONTAINER (frame), grid);
 
   adj = 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_grid_attach_aligned (GTK_GRID (grid), 0, 0,
                             _("_Border:"), 0.0, 0.5,
@@ -671,7 +671,7 @@ save_dialog (gint32 image_ID)
                     gtmvals.clheight);
 
   adj = 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_grid_attach_aligned (GTK_GRID (grid), 0, 3,
                             _("Cell-_padding:"), 0.0, 0.5,
@@ -685,7 +685,7 @@ save_dialog (gint32 image_ID)
                     &gtmvals.cellpadding);
 
   adj = 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_grid_attach_aligned (GTK_GRID (grid), 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 f626597f9b..45e00bee78 100644
--- a/plug-ins/common/file-mng.c
+++ b/plug-ins/common/file-mng.c
@@ -1528,7 +1528,7 @@ mng_save_dialog (gint32 image_id)
 
   spinbutton_adj = 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 86c2cc9094..24f5f9f71e 100644
--- a/plug-ins/common/file-pdf-load.c
+++ b/plug-ins/common/file-pdf-load.c
@@ -1370,8 +1370,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 68a99eb61c..935a9bdbc8 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 = 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_grid_attach_aligned (GTK_GRID (grid), 0, 0,
                             _("Resolution:"), 0.0, 0.5,
@@ -3467,7 +3467,7 @@ load_dialog (const gchar *filename)
   adj = 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_grid_attach_aligned (GTK_GRID (grid), 0, 1,
                             _("_Width:"), 0.0, 0.5,
@@ -3480,7 +3480,7 @@ load_dialog (const gchar *filename)
   adj = 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_grid_attach_aligned (GTK_GRID (grid), 0, 2,
                             _("_Height:"), 0.0, 0.5,
@@ -3670,7 +3670,7 @@ save_dialog (void)
 
   vals->adjustment[0] = 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_grid_attach_aligned (GTK_GRID (grid), 0, 0,
                             _("_Width:"), 0.0, 0.5,
@@ -3681,7 +3681,7 @@ save_dialog (void)
 
   vals->adjustment[1] = 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_grid_attach_aligned (GTK_GRID (grid), 0, 1,
                             _("_Height:"), 0.0, 0.5,
@@ -3692,7 +3692,7 @@ save_dialog (void)
 
   vals->adjustment[2] = 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_grid_attach_aligned (GTK_GRID (grid), 0, 2,
                             _("_X offset:"), 0.0, 0.5,
@@ -3703,7 +3703,7 @@ save_dialog (void)
 
   vals->adjustment[3] = 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_grid_attach_aligned (GTK_GRID (grid), 0, 3,
                             _("_Y offset:"), 0.0, 0.5,
@@ -3804,7 +3804,7 @@ save_dialog (void)
 
   adj = 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_grid_attach_aligned (GTK_GRID (grid), 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 fa67d93603..08d8dc4c2e 100644
--- a/plug-ins/common/file-svg.c
+++ b/plug-ins/common/file-svg.c
@@ -795,7 +795,7 @@ load_dialog (const gchar  *filename,
   gtk_widget_show (hbox);
 
   adj = 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);
@@ -845,7 +845,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_grid_attach (GTK_GRID (grid2), spinbutton, 0, 0, 1, 1);
@@ -866,7 +866,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_grid_attach (GTK_GRID (grid2), spinbutton, 0, 1, 1, 1);
diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c
index a61121aca9..f9b9a62667 100644
--- a/plug-ins/common/file-wmf.c
+++ b/plug-ins/common/file-wmf.c
@@ -586,7 +586,7 @@ load_dialog (const gchar *filename)
   gtk_widget_show (hbox);
 
   adj = 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);
@@ -634,7 +634,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_grid_attach (GTK_GRID (grid2), spinbutton, 0, 0, 1, 1);
@@ -654,7 +654,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_grid_attach (GTK_GRID (grid2), spinbutton, 0, 1, 1, 1);
diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c
index f10ee8eb18..3159ce1a8e 100644
--- a/plug-ins/common/file-xbm.c
+++ b/plug-ins/common/file-xbm.c
@@ -1324,7 +1324,7 @@ save_dialog (gint32 drawable_ID)
   adj = 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_grid_attach_aligned (GTK_GRID (grid), 0, 0,
                             _("Hot spot _X:"), 0.0, 0.5,
@@ -1337,7 +1337,7 @@ save_dialog (gint32 drawable_ID)
   adj = 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_grid_attach_aligned (GTK_GRID (grid), 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 db1a969f4a..035ed8a32b 100644
--- a/plug-ins/common/file-xmc.c
+++ b/plug-ins/common/file-xmc.c
@@ -1092,7 +1092,7 @@ save_dialog (const gint32   image_ID,
   x2 = hotspotRange->width + hotspotRange->x - 1;
 
   adjustment = 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*/
@@ -1114,7 +1114,7 @@ save_dialog (const gint32   image_ID,
   y2 = hotspotRange->height + hotspotRange->y - 1;
 
   adjustment = 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*/
@@ -1218,7 +1218,7 @@ save_dialog (const gint32   image_ID,
 
   adjustment = 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 18c86b36f8..52c48878de 100644
--- a/plug-ins/common/film.c
+++ b/plug-ins/common/film.c
@@ -1002,7 +1002,7 @@ create_selection_tab (GtkWidget *notebook,
   /* Film height */
   adj = 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_grid_attach_aligned (GTK_GRID (grid), 0, 0,
@@ -1061,7 +1061,7 @@ create_selection_tab (GtkWidget *notebook,
   /* Startindex */
   adj = 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_grid_attach_aligned (GTK_GRID (grid), 0, 0,
diff --git a/plug-ins/common/sample-colorize.c b/plug-ins/common/sample-colorize.c
index eb9510f50b..73c616b52d 100644
--- a/plug-ins/common/sample-colorize.c
+++ b/plug-ins/common/sample-colorize.c
@@ -1569,7 +1569,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 = 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);
@@ -1582,7 +1582,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 = 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);
@@ -1595,7 +1595,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 = 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 = 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 = 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 8a6404f9f9..f39a6804fc 100644
--- a/plug-ins/common/smooth-palette.c
+++ b/plug-ins/common/smooth-palette.c
@@ -470,7 +470,7 @@ dialog (gint32 drawable_id)
   gtk_widget_show (sizeentry);
 
   adj = 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_grid_attach_aligned (GTK_GRID (sizeentry), 0, 2,
diff --git a/plug-ins/common/tile-small.c b/plug-ins/common/tile-small.c
index 9e7cdc5838..6b62c37da9 100644
--- a/plug-ins/common/tile-small.c
+++ b/plug-ins/common/tile-small.c
@@ -359,7 +359,7 @@ spin_button_new (GtkAdjustment **adjustment,  /* return value */
   *adjustment = gtk_adjustment_new (value, lower, upper,
                                     step_increment, page_increment, 0);
 
-  spinbutton = gtk_spin_button_new (*adjustment, climb_rate, digits);
+  spinbutton = gimp_spin_button_new (*adjustment, climb_rate, digits);
 
   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
 
diff --git a/plug-ins/common/unit-editor.c b/plug-ins/common/unit-editor.c
index de0977e6cc..89ad010db7 100644
--- a/plug-ins/common/unit-editor.c
+++ b/plug-ins/common/unit-editor.c
@@ -240,7 +240,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_grid_attach_aligned (GTK_GRID (grid), 0, 1,
                             _("_Factor:"), 0.0, 0.5,
@@ -251,7 +251,7 @@ new_unit_dialog (GtkWidget *main_dialog,
   digits_adj = 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_grid_attach_aligned (GTK_GRID (grid), 0, 2,
                             _("_Digits:"), 0.0, 0.5,
diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c
index b3b5c8b6fa..f5836801e5 100644
--- a/plug-ins/common/warp.c
+++ b/plug-ins/common/warp.c
@@ -367,8 +367,8 @@ spin_button_new (GtkAdjustment **adjustment,  /* return value */
   *adjustment = gtk_adjustment_new (value, lower, upper,
                                     step_increment, page_increment, 0);
 
-  spinbutton = gtk_spin_button_new (*adjustment,
-                                    climb_rate, digits);
+  spinbutton = gimp_spin_button_new (*adjustment,
+                                     climb_rate, digits);
 
   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
 
diff --git a/plug-ins/common/web-page.c b/plug-ins/common/web-page.c
index 8b57665dbb..8804ed6a5b 100644
--- a/plug-ins/common/web-page.c
+++ b/plug-ins/common/web-page.c
@@ -293,7 +293,7 @@ webpage_dialog (void)
 
   adjustment = 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 d0753dd829..bb553adac7 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 = 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_grid_attach_aligned (GTK_GRID (grid), 0, 0,
                             C_("frame-range", "From:"), 0.0, 0.5,
@@ -907,7 +907,7 @@ load_dialog (const gchar *filename)
                     &from_frame);
 
   adj = 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_grid_attach_aligned (GTK_GRID (grid), 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 = 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_grid_attach_aligned (GTK_GRID (grid), 0, 0,
                             C_("frame-range", "From:"), 0.0, 0.5,
@@ -965,7 +965,7 @@ save_dialog (gint32 image_id)
                     &from_frame);
 
   adj = 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_grid_attach_aligned (GTK_GRID (grid), 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 72cb7dbd2b..9ea605fc1a 100644
--- a/plug-ins/file-jpeg/jpeg-save.c
+++ b/plug-ins/file-jpeg/jpeg-save.c
@@ -1010,7 +1010,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_grid_attach (GTK_GRID (grid), spinbutton, 5, 1, 1, 1);
   gtk_widget_show (spinbutton);
diff --git a/plug-ins/file-webp/file-webp-dialog.c b/plug-ins/file-webp/file-webp-dialog.c
index 04656b0402..c98472555f 100644
--- a/plug-ins/file-webp/file-webp-dialog.c
+++ b/plug-ins/file-webp/file-webp-dialog.c
@@ -277,7 +277,7 @@ save_dialog (WebPSaveParams *params,
       adj_kf = 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);
@@ -333,7 +333,7 @@ save_dialog (WebPSaveParams *params,
 
       /* default delay */
       adj = 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 31db6c5c68..6b5e934e5e 100644
--- a/plug-ins/ifs-compose/ifs-compose.c
+++ b/plug-ins/ifs-compose/ifs-compose.c
@@ -2091,7 +2091,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_ui_grid.c b/plug-ins/imagemap/imap_ui_grid.c
index 9af9cbbb9b..2a43b63e1b 100644
--- a/plug-ins/imagemap/imap_ui_grid.c
+++ b/plug-ins/imagemap/imap_ui_grid.c
@@ -48,7 +48,7 @@ create_spin_button_in_grid (GtkWidget *grid,
                             gint       max)
 {
    GtkAdjustment *adj = gtk_adjustment_new (value, min, max, 1, 10, 0);
-   GtkWidget *button = gtk_spin_button_new (adj, 1, 0);
+   GtkWidget *button = gimp_spin_button_new (adj, 1, 0);
 
    gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (button), TRUE);
    if (label)
diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c
index 1a23dff399..0f238f3173 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 */
   *adjustment = gtk_adjustment_new (value, lower, upper,
                                     step_increment, page_increment, 0);
 
-  spinbutton = gtk_spin_button_new (*adjustment,
-                                    climb_rate, digits);
+  spinbutton = gimp_spin_button_new (*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 b858b2d75f..bdf1798f56 100644
--- a/plug-ins/map-object/map-object-ui.c
+++ b/plug-ins/map-object/map-object-ui.c
@@ -403,8 +403,8 @@ spin_button_new (GtkAdjustment **adjustment,  /* return value */
   *adjustment = gtk_adjustment_new (value, lower, upper,
                                     step_increment, page_increment, 0);
 
-  spinbutton = gtk_spin_button_new (*adjustment,
-                                    climb_rate, digits);
+  spinbutton = gimp_spin_button_new (*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 2a1b1118a1..0b43168daa 100644
--- a/plug-ins/print/print-page-layout.c
+++ b/plug-ins/print/print-page-layout.c
@@ -273,7 +273,7 @@ print_size_frame (PrintData    *data,
   gtk_grid_set_row_spacing (GTK_GRID (entry), 2);
 
   adj = 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_grid_set_row_spacing (GTK_GRID (entry), 2);
 
   adj = 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);
@@ -399,7 +399,7 @@ print_offset_frame (PrintData    *data,
 
   /* left */
   info.left_adj = 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),
@@ -416,7 +416,7 @@ print_offset_frame (PrintData    *data,
 
   /* right */
   info.right_adj = 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",
@@ -436,7 +436,7 @@ print_offset_frame (PrintData    *data,
 
   /* top */
   info.top_adj = 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),
@@ -453,7 +453,7 @@ print_offset_frame (PrintData    *data,
 
   /* bottom */
   info.bottom_adj = 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 7bb64d475b..99c1e287e0 100644
--- a/plug-ins/screenshot/screenshot.c
+++ b/plug-ins/screenshot/screenshot.c
@@ -695,7 +695,7 @@ shoot_dialog (GdkMonitor **monitor)
 
   adj = 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_grid_attach (GTK_GRID (grid), spinner, 1, 0, 1, 1);
   gtk_widget_show (spinner);
@@ -754,7 +754,7 @@ shoot_dialog (GdkMonitor **monitor)
 
   adj = 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_grid_attach (GTK_GRID (grid), spinner, 1, 0, 1, 1);
   gtk_widget_show (spinner);
diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c
index 8903710d77..3066b694b1 100644
--- a/plug-ins/script-fu/script-fu-interface.c
+++ b/plug-ins/script-fu/script-fu-interface.c
@@ -439,9 +439,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 70858c9f2c..bcbb6309e3 100644
--- a/plug-ins/ui/plug-in-file-gif.ui
+++ b/plug-ins/ui/plug-in-file-gif.ui
@@ -193,7 +193,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkSpinButton" id="delay-spin">
+                  <object class="GimpSpinButton" id="delay-spin">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="tooltip_text" translatable="yes">GIF supports hundredths of a second 
precision.</property>
diff --git a/plug-ins/ui/plug-in-file-png.ui b/plug-ins/ui/plug-in-file-png.ui
index 3d33509b13..5ea2d96ff9 100644
--- a/plug-ins/ui/plug-in-file-png.ui
+++ b/plug-ins/ui/plug-in-file-png.ui
@@ -252,7 +252,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkSpinButton" id="compression-level-spin">
+      <object class="GimpSpinButton" id="compression-level-spin">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="has_tooltip">True</property>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]