[gimp] plug-ins: more gimp_spin_button_new() -> gtk_spin_button_new()



commit 6914bbc65fba55f9767eb59bd58b497070886437
Author: Michael Natterer <mitch gimp org>
Date:   Sun Jun 22 23:01:31 2014 +0200

    plug-ins: more gimp_spin_button_new() -> gtk_spin_button_new()

 plug-ins/common/file-gbr.c        |   17 +++---
 plug-ins/common/file-gih.c        |  104 +++++++++++++++++---------------
 plug-ins/common/file-html-table.c |   38 +++++++-----
 plug-ins/common/file-mng.c        |    8 ++-
 plug-ins/common/file-pdf-load.c   |   20 +++---
 plug-ins/common/file-ps.c         |  119 +++++++++++++++++++++---------------
 plug-ins/common/file-svg.c        |   80 +++++++++++++------------
 plug-ins/common/file-wmf.c        |   72 +++++++++++-----------
 plug-ins/common/file-xbm.c        |   38 +++++++-----
 plug-ins/common/file-xmc.c        |   62 ++++++++++++-------
 plug-ins/common/screenshot.c      |   35 ++++++-----
 plug-ins/common/unit-editor.c     |   46 ++++++++-------
 plug-ins/common/web-page.c        |   34 ++++++-----
 plug-ins/win-snap/winsnap.c       |   26 ++++----
 14 files changed, 386 insertions(+), 313 deletions(-)
---
diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
index 05662ea..82f781e 100644
--- a/plug-ins/common/file-gbr.c
+++ b/plug-ins/common/file-gbr.c
@@ -767,12 +767,12 @@ save_image (GFile   *file,
 static gboolean
 save_dialog (void)
 {
-  GtkWidget *dialog;
-  GtkWidget *table;
-  GtkWidget *entry;
-  GtkWidget *spinbutton;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *table;
+  GtkWidget     *entry;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   dialog = gimp_export_dialog_new (_("Brush"), PLUG_IN_BINARY, SAVE_PROC);
 
@@ -785,8 +785,9 @@ save_dialog (void)
                       table, TRUE, TRUE, 0);
   gtk_widget_show (table);
 
-  spinbutton = gimp_spin_button_new (&adj,
-                                     info.spacing, 1, 1000, 1, 10, 0, 1, 0);
+  adj = (GtkAdjustment *) gtk_adjustment_new (info.spacing, 1, 1000, 1, 10, 0);
+  spinbutton = gtk_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,
                              _("Spacing:"), 1.0, 0.5,
                              spinbutton, 1, TRUE);
diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c
index bae1f00..6bd704e 100644
--- a/plug-ins/common/file-gih.c
+++ b/plug-ins/common/file-gih.c
@@ -89,20 +89,20 @@ static GimpPixPipeParams gihparams;
 
 typedef struct
 {
-  GimpOrientationType orientation;
-  gint32     image;
-  gint32     toplayer;
-  gint       nguides;
-  gint32    *guides;
-  gint      *value;
-  GtkWidget *count_label;       /* Corresponding count adjustment, */
-  gint      *count;             /* cols or rows                    */
-  gint      *other_count;       /* and the other one               */
-  GtkObject *ncells;
-  GtkObject *rank0;
-  GtkWidget *warning_label;
-  GtkWidget *rank_entry[GIMP_PIXPIPE_MAXDIM];
-  GtkWidget *mode_entry[GIMP_PIXPIPE_MAXDIM];
+  GimpOrientationType  orientation;
+  gint32               image;
+  gint32               toplayer;
+  gint                 nguides;
+  gint32              *guides;
+  gint                *value;
+  GtkWidget           *count_label;    /* Corresponding count adjustment, */
+  gint                *count;          /* cols or rows                    */
+  gint                *other_count;    /* and the other one               */
+  GtkAdjustment       *ncells;
+  GtkAdjustment       *rank0;
+  GtkWidget           *warning_label;
+  GtkWidget           *rank_entry[GIMP_PIXPIPE_MAXDIM];
+  GtkWidget           *mode_entry[GIMP_PIXPIPE_MAXDIM];
 } SizeAdjustmentData;
 
 /* static gint32 *vguides, *hguides;       */
@@ -882,22 +882,22 @@ dim_callback (GtkAdjustment *adjustment,
 static gboolean
 gih_save_dialog (gint32 image_ID)
 {
-  GtkWidget *dialog;
-  GtkWidget *table;
-  GtkWidget *dimtable;
-  GtkWidget *label;
-  GtkObject *adjustment;
-  GtkWidget *spinbutton;
-  GtkWidget *entry;
-  GtkWidget *box;
-  GtkWidget *cb;
-  gint       i;
-  gchar      buffer[100];
-  SizeAdjustmentData cellw_adjust;
-  SizeAdjustmentData cellh_adjust;
-  gint32    *layer_ID;
-  gint32     nlayers;
-  gboolean   run;
+  GtkWidget          *dialog;
+  GtkWidget          *table;
+  GtkWidget          *dimtable;
+  GtkWidget          *label;
+  GtkAdjustment      *adjustment;
+  GtkWidget          *spinbutton;
+  GtkWidget          *entry;
+  GtkWidget          *box;
+  GtkWidget          *cb;
+  gint                i;
+  gchar               buffer[100];
+  SizeAdjustmentData  cellw_adjust;
+  SizeAdjustmentData  cellh_adjust;
+  gint32             *layer_ID;
+  gint32              nlayers;
+  gboolean            run;
 
   dialog = gimp_export_dialog_new (_("Brush Pipe"), PLUG_IN_BINARY, SAVE_PROC);
 
@@ -913,8 +913,10 @@ gih_save_dialog (gint32 image_ID)
   /*
    * Spacing: __
    */
-  spinbutton = gimp_spin_button_new (&adjustment, info.spacing,
-                                     1, 1000, 1, 10, 0, 1, 0);
+  adjustment = (GtkAdjustment *) gtk_adjustment_new (info.spacing,
+                                                     1, 1000, 1, 10, 0);
+  spinbutton = gtk_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, 0,
                              _("Spacing (percent):"), 0.0, 0.5,
                              spinbutton, 1, TRUE);
@@ -942,10 +944,11 @@ gih_save_dialog (gint32 image_ID)
    */
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
 
-  spinbutton = gimp_spin_button_new (&adjustment,
-                                     gihparams.cellwidth,
-                                     2, gimp_image_width (image_ID), 1, 10, 0,
-                                     1, 0);
+  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);
+  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);
 
@@ -965,10 +968,11 @@ gih_save_dialog (gint32 image_ID)
   gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
 
-  spinbutton = gimp_spin_button_new (&adjustment,
-                                     gihparams.cellheight,
-                                     2, gimp_image_height (image_ID), 1, 10, 0,
-                                     1, 0);
+  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);
+  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);
 
@@ -996,9 +1000,10 @@ gih_save_dialog (gint32 image_ID)
   /*
    * Number of cells: ___
    */
-  spinbutton = gimp_spin_button_new (&adjustment,
-                                     gihparams.ncells, 1, 1000, 1, 10, 0,
-                                     1, 0);
+  adjustment = (GtkAdjustment *)
+    gtk_adjustment_new (gihparams.ncells, 1, 1000, 1, 10, 0);
+  spinbutton = gtk_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,
                              spinbutton, 1, TRUE);
@@ -1056,8 +1061,10 @@ gih_save_dialog (gint32 image_ID)
   /*
    * Dimension: ___
    */
-  spinbutton = gimp_spin_button_new (&adjustment, gihparams.dim,
-                                     1, GIMP_PIXPIPE_MAXDIM, 1, 1, 0, 1, 0);
+  adjustment = (GtkAdjustment *)
+    gtk_adjustment_new (gihparams.dim, 1, GIMP_PIXPIPE_MAXDIM, 1, 1, 0);
+  spinbutton = gtk_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,
                              spinbutton, 1, TRUE);
@@ -1076,9 +1083,10 @@ gih_save_dialog (gint32 image_ID)
     {
       gint j;
 
-      spinbutton = gimp_spin_button_new (&adjustment,
-                                         gihparams.rank[i], 1, 100, 1, 1, 0,
-                                         1, 0);
+      adjustment = (GtkAdjustment *)
+        gtk_adjustment_new (gihparams.rank[i], 1, 100, 1, 1, 0);
+      spinbutton = gtk_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 dcaa0d8..54579ef 100644
--- a/plug-ins/common/file-html-table.c
+++ b/plug-ins/common/file-html-table.c
@@ -397,16 +397,16 @@ save_image (const gchar  *filename,
 static gint
 save_dialog (gint32 image_ID)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *table;
-  GtkWidget *spinbutton;
-  GtkObject *adj;
-  GtkWidget *entry;
-  GtkWidget *toggle;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *frame;
+  GtkWidget     *vbox;
+  GtkWidget     *table;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  GtkWidget     *entry;
+  GtkWidget     *toggle;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
@@ -565,8 +565,10 @@ save_dialog (gint32 image_ID)
   gtk_table_set_row_spacings (GTK_TABLE (table), 6);
   gtk_container_add (GTK_CONTAINER (frame), table);
 
-  spinbutton = gimp_spin_button_new (&adj, gtmvals.border,
-                                     0, 1000, 1, 10, 0, 1, 0);
+  adj = (GtkAdjustment *) gtk_adjustment_new (gtmvals.border,
+                                              0, 1000, 1, 10, 0);
+  spinbutton = gtk_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,
                              spinbutton, 1, TRUE);
@@ -611,8 +613,10 @@ save_dialog (gint32 image_ID)
                     G_CALLBACK (gtm_clheight_callback),
                     NULL);
 
-  spinbutton = gimp_spin_button_new (&adj, gtmvals.cellpadding,
-                                     0, 1000, 1, 10, 0, 1, 0);
+  adj = (GtkAdjustment *) gtk_adjustment_new (gtmvals.cellpadding,
+                                              0, 1000, 1, 10, 0);
+  spinbutton = gtk_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,
                              spinbutton, 1, TRUE);
@@ -624,8 +628,10 @@ save_dialog (gint32 image_ID)
                     G_CALLBACK (gimp_int_adjustment_update),
                     &gtmvals.cellpadding);
 
-  spinbutton = gimp_spin_button_new (&adj, gtmvals.cellspacing,
-                                     0, 1000, 1, 10, 0, 1, 0);
+  adj = (GtkAdjustment *) gtk_adjustment_new (gtmvals.cellspacing,
+                                              0, 1000, 1, 10, 0);
+  spinbutton = gtk_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,
                              spinbutton, 1, TRUE);
diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c
index ab423f7..5387427 100644
--- a/plug-ins/common/file-mng.c
+++ b/plug-ins/common/file-mng.c
@@ -1529,9 +1529,11 @@ mng_save_dialog (gint32 image_id)
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
 
-  spinbutton = gimp_spin_button_new ((GtkObject **) &spinbutton_adj,
-                                     mng_data.default_delay,
-                                     0, 65000, 10, 100, 0, 1, 0);
+  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);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
 
   g_signal_connect (spinbutton_adj, "value-changed",
                     G_CALLBACK (gimp_int_adjustment_update),
diff --git a/plug-ins/common/file-pdf-load.c b/plug-ins/common/file-pdf-load.c
index a57426a..8db4aa1 100644
--- a/plug-ins/common/file-pdf-load.c
+++ b/plug-ins/common/file-pdf-load.c
@@ -132,7 +132,7 @@ struct _GimpResolutionEntryField
 
   guint          changed_signal;
 
-  GtkObject     *adjustment;
+  GtkAdjustment *adjustment;
   GtkWidget     *spinbutton;
 
   gdouble        phy_size;
@@ -1373,14 +1373,14 @@ gimp_resolution_entry_field_init (GimpResolutionEntry      *gre,
 
   digits = size ? 0 : MIN (gimp_unit_get_digits (initial_unit), 5) + 1;
 
-  gref->spinbutton = gimp_spin_button_new (&gref->adjustment,
-                                            gref->value,
-                                            gref->min_value,
-                                            gref->max_value,
-                                            1.0, 10.0, 0.0,
-                                            1.0,
-                                            digits);
-
+  gref->adjustment = (GtkAdjustment *)
+    gtk_adjustment_new (gref->value,
+                        gref->min_value,
+                        gref->max_value,
+                        1.0, 10.0, 0.0);
+  gref->spinbutton = gtk_spin_button_new (gref->adjustment,
+                                          1.0, digits);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (gref->spinbutton), TRUE);
 
   if (spinbutton_width > 0)
     {
@@ -1643,7 +1643,7 @@ gimp_resolution_entry_update_value (GimpResolutionEntryField *gref,
                                           factor);
     }
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (gref->adjustment), value);
+  gtk_adjustment_set_value (gref->adjustment, value);
 
   gref->stop_recursion--;
 
diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c
index 74c2fe4..c254def 100644
--- a/plug-ins/common/file-ps.c
+++ b/plug-ins/common/file-ps.c
@@ -266,8 +266,8 @@ static gboolean  resolution_change_callback (GtkAdjustment *adjustment,
 
 typedef struct
 {
-  GtkObject *adjustment[4];
-  gint       level;
+  GtkAdjustment *adjustment[4];
+  gint           level;
 } SaveDialogVals;
 
 static gboolean  save_dialog              (void);
@@ -3002,21 +3002,21 @@ static gboolean
 load_dialog (const gchar *filename,
              gboolean     loadPDF)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *hbox;
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *table;
-  GtkWidget *spinbutton;
-  GtkObject *adj;
-  GtkWidget *entry    = NULL;
-  GtkWidget *target   = NULL;
-  GtkWidget *toggle;
-  GtkWidget *selector = NULL;
-  gint32     page_count;
-  gchar     *range    = NULL;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *frame;
+  GtkWidget     *vbox;
+  GtkWidget     *table;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  GtkWidget     *entry    = NULL;
+  GtkWidget     *target   = NULL;
+  GtkWidget     *toggle;
+  GtkWidget     *selector = NULL;
+  gint32         page_count;
+  gchar         *range    = NULL;
+  gboolean       run;
 
   page_count = count_ps_pages (filename);
 
@@ -3079,9 +3079,11 @@ load_dialog (const gchar *filename,
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
   gtk_widget_show (table);
 
-  spinbutton = gimp_spin_button_new (&adj, plvals.resolution,
-                                     MIN_RESOLUTION, MAX_RESOLUTION,
-                                     1, 10, 0, 1, 0);
+  adj = (GtkAdjustment *) gtk_adjustment_new (plvals.resolution,
+                                              MIN_RESOLUTION, MAX_RESOLUTION,
+                                              1, 10, 0);
+  spinbutton = gtk_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,
                              spinbutton, 1, FALSE);
@@ -3089,28 +3091,32 @@ load_dialog (const gchar *filename,
   g_signal_connect (adj, "value-changed",
                     G_CALLBACK (resolution_change_callback),
                     &plvals.resolution);
-
   g_signal_connect (adj, "value-changed",
                     G_CALLBACK (gimp_int_adjustment_update),
                     &plvals.resolution);
 
-
-  ps_width_spinbutton = gimp_spin_button_new (&adj, plvals.width,
+  adj = (GtkAdjustment *) gtk_adjustment_new (plvals.width,
                                               1, GIMP_MAX_IMAGE_SIZE,
-                                              1, 10, 0, 1, 0);
+                                              1, 10, 0);
+  ps_width_spinbutton = gtk_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,
                              ps_width_spinbutton, 1, FALSE);
+
   g_signal_connect (adj, "value-changed",
                     G_CALLBACK (gimp_int_adjustment_update),
                     &plvals.width);
 
-  ps_height_spinbutton = gimp_spin_button_new (&adj, plvals.height,
-                                               1, GIMP_MAX_IMAGE_SIZE,
-                                               1, 10, 0, 1, 0);
+  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);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
                              _("_Height:"), 0.0, 0.5,
                              ps_height_spinbutton, 1, FALSE);
+
   g_signal_connect (adj, "value-changed",
                     G_CALLBACK (gimp_int_adjustment_update),
                     &plvals.height);
@@ -3250,16 +3256,16 @@ static gboolean
 save_dialog (void)
 {
   SaveDialogVals *vals;
-  GtkWidget *dialog;
-  GtkWidget *toggle;
-  GtkWidget *frame, *uframe;
-  GtkWidget *hbox, *vbox;
-  GtkWidget *main_vbox[2];
-  GtkWidget *table;
-  GtkWidget *spinbutton;
-  GtkObject *adj;
-  gint       j;
-  gboolean   run;
+  GtkWidget      *dialog;
+  GtkWidget      *toggle;
+  GtkWidget      *frame, *uframe;
+  GtkWidget      *hbox, *vbox;
+  GtkWidget      *main_vbox[2];
+  GtkWidget      *table;
+  GtkWidget      *spinbutton;
+  GtkAdjustment  *adj;
+  gint            j;
+  gboolean        run;
 
   vals = g_new (SaveDialogVals, 1);
   vals->level = (psvals.level > 1);
@@ -3294,8 +3300,11 @@ save_dialog (void)
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
   gtk_widget_show (table);
 
-  spinbutton = gimp_spin_button_new (&vals->adjustment[0], psvals.width,
-                                     1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
+  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);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
                              _("_Width:"), 0.0, 0.5,
                              spinbutton, 1, FALSE);
@@ -3303,8 +3312,11 @@ save_dialog (void)
                     G_CALLBACK (gimp_double_adjustment_update),
                     &psvals.width);
 
-  spinbutton = gimp_spin_button_new (&vals->adjustment[1], psvals.height,
-                                     1e-5, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
+  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);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
                              _("_Height:"), 0.0, 0.5,
                              spinbutton, 1, FALSE);
@@ -3312,8 +3324,11 @@ save_dialog (void)
                     G_CALLBACK (gimp_double_adjustment_update),
                     &psvals.height);
 
-  spinbutton = gimp_spin_button_new (&vals->adjustment[2], psvals.x_offset,
-                                     0.0, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
+  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);
+  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,
                              spinbutton, 1, FALSE);
@@ -3321,8 +3336,11 @@ save_dialog (void)
                     G_CALLBACK (gimp_double_adjustment_update),
                     &psvals.x_offset);
 
-  spinbutton = gimp_spin_button_new (&vals->adjustment[3], psvals.y_offset,
-                                     0.0, GIMP_MAX_IMAGE_SIZE, 1, 10, 0, 1, 2);
+  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);
+  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,
                              spinbutton, 1, FALSE);
@@ -3420,8 +3438,10 @@ save_dialog (void)
                           table,  "sensitive",
                           G_BINDING_SYNC_CREATE);
 
-  spinbutton = gimp_spin_button_new (&adj, psvals.preview_size,
-                                     0, 1024, 1, 10, 0, 1, 0);
+  adj = (GtkAdjustment *) gtk_adjustment_new (psvals.preview_size,
+                                              0, 1024, 1, 10, 0);
+  spinbutton = gtk_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,
                              spinbutton, 1, FALSE);
@@ -3472,10 +3492,9 @@ save_unit_toggle_update (GtkWidget *widget,
 
       for (i = 0; i < 4; i++)
         {
-          value = gtk_adjustment_get_value (GTK_ADJUSTMENT (vals->adjustment[i])) * factor;
+          value = gtk_adjustment_get_value (vals->adjustment[i]) * factor;
 
-          gtk_adjustment_set_value (GTK_ADJUSTMENT (vals->adjustment[i]),
-                                    value);
+          gtk_adjustment_set_value (vals->adjustment[i], value);
         }
     }
 }
diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c
index 0489f25..60dea27 100644
--- a/plug-ins/common/file-svg.c
+++ b/plug-ins/common/file-svg.c
@@ -567,8 +567,8 @@ load_rsvg_size (const gchar  *filename,
 /*  User interface  */
 
 static GimpSizeEntry *size       = NULL;
-static GtkObject     *xadj       = NULL;
-static GtkObject     *yadj       = NULL;
+static GtkAdjustment *xadj       = NULL;
+static GtkAdjustment *yadj       = NULL;
 static GtkWidget     *constrain  = NULL;
 static gdouble        ratio_x    = 1.0;
 static gdouble        ratio_y    = 1.0;
@@ -603,8 +603,8 @@ static void
 load_dialog_ratio_callback (GtkAdjustment *adj,
                             gpointer       data)
 {
-  gdouble x = gtk_adjustment_get_value (GTK_ADJUSTMENT (xadj));
-  gdouble y = gtk_adjustment_get_value (GTK_ADJUSTMENT (yadj));
+  gdouble x = gtk_adjustment_get_value (xadj);
+  gdouble y = gtk_adjustment_get_value (yadj);
 
   if (gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (constrain)))
     {
@@ -664,8 +664,8 @@ load_dialog_set_ratio (gdouble x,
   g_signal_handlers_block_by_func (xadj, load_dialog_ratio_callback, NULL);
   g_signal_handlers_block_by_func (yadj, load_dialog_ratio_callback, NULL);
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (xadj), x);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (yadj), y);
+  gtk_adjustment_set_value (xadj, x);
+  gtk_adjustment_set_value (yadj, y);
 
   g_signal_handlers_unblock_by_func (xadj, load_dialog_ratio_callback, NULL);
   g_signal_handlers_unblock_by_func (yadj, load_dialog_ratio_callback, NULL);
@@ -675,24 +675,24 @@ static GimpPDBStatusType
 load_dialog (const gchar  *filename,
              GError      **load_error)
 {
-  GtkWidget   *dialog;
-  GtkWidget   *frame;
-  GtkWidget   *hbox;
-  GtkWidget   *vbox;
-  GtkWidget   *image;
-  GdkPixbuf   *preview;
-  GtkWidget   *table;
-  GtkWidget   *table2;
-  GtkWidget   *abox;
-  GtkWidget   *res;
-  GtkWidget   *label;
-  GtkWidget   *spinbutton;
-  GtkWidget   *toggle;
-  GtkWidget   *toggle2;
-  GtkObject   *adj;
-  gboolean     run;
-  GError      *error = NULL;
-  SvgLoadVals  vals  =
+  GtkWidget     *dialog;
+  GtkWidget     *frame;
+  GtkWidget     *hbox;
+  GtkWidget     *vbox;
+  GtkWidget     *image;
+  GdkPixbuf     *preview;
+  GtkWidget     *table;
+  GtkWidget     *table2;
+  GtkWidget     *abox;
+  GtkWidget     *res;
+  GtkWidget     *label;
+  GtkWidget     *spinbutton;
+  GtkWidget     *toggle;
+  GtkWidget     *toggle2;
+  GtkAdjustment *adj;
+  gboolean       run;
+  GError        *error = NULL;
+  SvgLoadVals    vals  =
   {
     SVG_DEFAULT_RESOLUTION,
     - SVG_PREVIEW_SIZE,
@@ -800,7 +800,9 @@ load_dialog (const gchar  *filename,
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (hbox);
 
-  spinbutton = gimp_spin_button_new (&adj, 1, 1, 1, 1, 10, 0, 1, 2);
+  adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+  spinbutton = gtk_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);
   gtk_widget_show (spinbutton);
@@ -848,13 +850,13 @@ load_dialog (const gchar  *filename,
   gtk_table_set_row_spacing (GTK_TABLE (table2), 0, 4);
   gtk_box_pack_start (GTK_BOX (hbox), table2, FALSE, FALSE, 0);
 
-  spinbutton =
-    gimp_spin_button_new (&xadj,
-                          ratio_x,
-                          (gdouble) GIMP_MIN_IMAGE_SIZE / (gdouble) svg_width,
-                          (gdouble) GIMP_MAX_IMAGE_SIZE / (gdouble) svg_width,
-                          0.01, 0.1, 0,
-                          0.01, 4);
+  xadj = (GtkAdjustment *)
+    gtk_adjustment_new (ratio_x,
+                        (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);
+  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);
   gtk_widget_show (spinbutton);
@@ -870,13 +872,13 @@ load_dialog (const gchar  *filename,
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (label);
 
-  spinbutton =
-    gimp_spin_button_new (&yadj,
-                          ratio_y,
-                          (gdouble) GIMP_MIN_IMAGE_SIZE / (gdouble) svg_height,
-                          (gdouble) GIMP_MAX_IMAGE_SIZE / (gdouble) svg_height,
-                          0.01, 0.1, 0,
-                          0.01, 4);
+  yadj = (GtkAdjustment *)
+    gtk_adjustment_new (ratio_y,
+                        (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);
+  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);
   gtk_widget_show (spinbutton);
diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c
index e376317..5c9b34a 100644
--- a/plug-ins/common/file-wmf.c
+++ b/plug-ins/common/file-wmf.c
@@ -373,8 +373,8 @@ load_wmf_size (const gchar *filename,
 /*  User interface  */
 
 static GimpSizeEntry *size       = NULL;
-static GtkObject     *xadj       = NULL;
-static GtkObject     *yadj       = NULL;
+static GtkAdjustment *xadj       = NULL;
+static GtkAdjustment *yadj       = NULL;
 static GtkWidget     *constrain  = NULL;
 static gdouble        ratio_x    = 1.0;
 static gdouble        ratio_y    = 1.0;
@@ -409,8 +409,8 @@ static void
 load_dialog_ratio_callback (GtkAdjustment *adj,
                             gpointer       data)
 {
-  gdouble x = gtk_adjustment_get_value (GTK_ADJUSTMENT (xadj));
-  gdouble y = gtk_adjustment_get_value (GTK_ADJUSTMENT (yadj));
+  gdouble x = gtk_adjustment_get_value (xadj);
+  gdouble y = gtk_adjustment_get_value (yadj);
 
   if (gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (constrain)))
     {
@@ -468,8 +468,8 @@ load_dialog_set_ratio (gdouble x,
   g_signal_handlers_block_by_func (xadj, load_dialog_ratio_callback, NULL);
   g_signal_handlers_block_by_func (yadj, load_dialog_ratio_callback, NULL);
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (xadj), x);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (yadj), y);
+  gtk_adjustment_set_value (xadj, x);
+  gtk_adjustment_set_value (yadj, y);
 
   g_signal_handlers_unblock_by_func (xadj, load_dialog_ratio_callback, NULL);
   g_signal_handlers_unblock_by_func (yadj, load_dialog_ratio_callback, NULL);
@@ -478,20 +478,20 @@ load_dialog_set_ratio (gdouble x,
 static gboolean
 load_dialog (const gchar *filename)
 {
-  GtkWidget *dialog;
-  GtkWidget *frame;
-  GtkWidget *hbox;
-  GtkWidget *vbox;
-  GtkWidget *image;
-  GtkWidget *table;
-  GtkWidget *table2;
-  GtkWidget *abox;
-  GtkWidget *res;
-  GtkWidget *label;
-  GtkWidget *spinbutton;
-  GtkObject *adj;
-  guchar    *pixels;
-  gboolean   run = FALSE;
+  GtkWidget     *dialog;
+  GtkWidget     *frame;
+  GtkWidget     *hbox;
+  GtkWidget     *vbox;
+  GtkWidget     *image;
+  GtkWidget     *table;
+  GtkWidget     *table2;
+  GtkWidget     *abox;
+  GtkWidget     *res;
+  GtkWidget     *label;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  guchar        *pixels;
+  gboolean       run = FALSE;
 
   WmfLoadVals  vals = { WMF_DEFAULT_RESOLUTION,
                         - WMF_PREVIEW_SIZE, - WMF_PREVIEW_SIZE };
@@ -586,7 +586,9 @@ load_dialog (const gchar *filename)
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (hbox);
 
-  spinbutton = gimp_spin_button_new (&adj, 1, 1, 1, 1, 10, 0, 1, 2);
+  adj = (GtkAdjustment *) gtk_adjustment_new (1, 1, 1, 1, 10, 0);
+  spinbutton = gtk_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);
   gtk_widget_show (spinbutton);
@@ -634,13 +636,13 @@ load_dialog (const gchar *filename)
   gtk_table_set_row_spacing (GTK_TABLE (table2), 0, 4);
   gtk_box_pack_start (GTK_BOX (hbox), table2, FALSE, FALSE, 0);
 
-  spinbutton =
-    gimp_spin_button_new (&xadj,
-                          ratio_x,
-                          (gdouble) GIMP_MIN_IMAGE_SIZE / (gdouble) wmf_width,
-                          (gdouble) GIMP_MAX_IMAGE_SIZE / (gdouble) wmf_width,
-                          0.01, 0.1, 0,
-                          0.01, 4);
+  xadj = (GtkAdjustment *)
+    gtk_adjustment_new (ratio_x,
+                        (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);
+  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);
   gtk_widget_show (spinbutton);
@@ -656,13 +658,13 @@ load_dialog (const gchar *filename)
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (label);
 
-  spinbutton =
-    gimp_spin_button_new (&yadj,
-                          ratio_y,
-                          (gdouble) GIMP_MIN_IMAGE_SIZE / (gdouble) wmf_height,
-                          (gdouble) GIMP_MAX_IMAGE_SIZE / (gdouble) wmf_height,
-                          0.01, 0.1, 0,
-                          0.01, 4);
+  yadj = (GtkAdjustment *)
+    gtk_adjustment_new (ratio_y,
+                        (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);
+  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);
   gtk_widget_show (spinbutton);
diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c
index 5c4b21b..73ae5ab 100644
--- a/plug-ins/common/file-xbm.c
+++ b/plug-ins/common/file-xbm.c
@@ -1175,15 +1175,15 @@ save_image (const gchar  *filename,
 static gboolean
 save_dialog (gint32 drawable_ID)
 {
-  GtkWidget *dialog;
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *toggle;
-  GtkWidget *table;
-  GtkWidget *entry;
-  GtkWidget *spinbutton;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *frame;
+  GtkWidget     *vbox;
+  GtkWidget     *toggle;
+  GtkWidget     *table;
+  GtkWidget     *entry;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   dialog = gimp_export_dialog_new (_("XBM"), PLUG_IN_BINARY, SAVE_PROC);
 
@@ -1259,22 +1259,30 @@ save_dialog (gint32 drawable_ID)
                           table,  "sensitive",
                           G_BINDING_SYNC_CREATE);
 
-  spinbutton = gimp_spin_button_new (&adj, xsvals.x_hot, 0,
-                                     gimp_drawable_width (drawable_ID) - 1,
-                                     1, 10, 0, 0, 0);
+  adj = (GtkAdjustment *)
+    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);
+  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,
                              spinbutton, 1, TRUE);
+
   g_signal_connect (adj, "value-changed",
                     G_CALLBACK (gimp_int_adjustment_update),
                     &xsvals.x_hot);
 
-  spinbutton = gimp_spin_button_new (&adj, xsvals.y_hot, 0,
-                                     gimp_drawable_height (drawable_ID) - 1,
-                                     1, 10, 0, 0, 0);
+  adj = (GtkAdjustment *)
+    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);
+  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,
                              spinbutton, 1, TRUE);
+
   g_signal_connect (adj, "value-changed",
                     G_CALLBACK (gimp_int_adjustment_update),
                     &xsvals.y_hot);
diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c
index cb86a7f..09c66e9 100644
--- a/plug-ins/common/file-xmc.c
+++ b/plug-ins/common/file-xmc.c
@@ -1019,7 +1019,7 @@ save_dialog (const gint32     image_ID,
   GtkWidget      *frame;
   GtkWidget      *table;
   GtkWidget      *box;
-  GtkObject      *adjustment;
+  GtkAdjustment  *adjustment;
   GtkWidget      *alignment;
   GtkWidget      *tmpwidget;
   GtkWidget      *label;
@@ -1053,38 +1053,48 @@ save_dialog (const gint32     image_ID,
   /* label "Hot spot  _X:" + spinbox */
   x1 = hotspotRange->x;
   x2 = hotspotRange->width + hotspotRange->x - 1;
-  tmpwidget =
-    gimp_spin_button_new (&adjustment, xmcparas.x, x1, x2, 1, 5, 0, 0, 0);
-  gtk_widget_show (tmpwidget);
+
+  adjustment = (GtkAdjustment *)
+    gtk_adjustment_new (xmcparas.x, x1, x2, 1, 5, 0);
+  tmpwidget = gtk_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*/
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                             _("Hot spot _X:"), 0, 0.5, tmpwidget, 1, TRUE);
+  gtk_widget_show (tmpwidget);
+
   g_signal_connect (adjustment, "value-changed",
                     G_CALLBACK (gimp_int_adjustment_update),
                     &xmcparas.x);
+
   gimp_help_set_help_data (tmpwidget,
                            _("Enter the X coordinate of the hot spot. "
                              "The origin is top left corner."),
                            NULL);
-  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
-                             _("Hot spot _X:"), 0, 0.5, tmpwidget, 1, TRUE);
+
   /* label "Y:" + spinbox */
   y1 = hotspotRange->y;
   y2 = hotspotRange->height + hotspotRange->y - 1;
-  tmpwidget =
-    gimp_spin_button_new (&adjustment, xmcparas.y, y1, y2, 1, 5, 0, 0, 0);
-  gtk_widget_show (tmpwidget);
+
+  adjustment = (GtkAdjustment *)
+    gtk_adjustment_new (xmcparas.y, y1, y2, 1, 5, 0);
+  tmpwidget = gtk_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*/
+  gimp_table_attach_aligned (GTK_TABLE (table), 1, 0,
+                             "_Y:", 1.0, 0.5, tmpwidget, 1, TRUE);
+  gtk_widget_show (tmpwidget);
+
   g_signal_connect (adjustment, "value-changed",
                     G_CALLBACK (gimp_int_adjustment_update),
                     &xmcparas.y);
-  /* tooltip */
+
   gimp_help_set_help_data (tmpwidget,
                            _("Enter the Y coordinate of the hot spot. "
                              "The origin is top left corner."),
                            NULL);
-  gimp_table_attach_aligned (GTK_TABLE (table), 1, 0,
-                             "_Y:", 1.0, 0.5, tmpwidget, 1, TRUE);
 
   /*
    *  Auto-crop
@@ -1163,29 +1173,35 @@ save_dialog (const gint32     image_ID,
    */
   /* spin button */
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gimp_table_attach_aligned (GTK_TABLE (table), 0, 4, _("_Delay:"),
+                             0, 0.5, box, 3, TRUE);
   gtk_widget_show (box);
-  tmpwidget = gimp_spin_button_new (&adjustment,
-                                    xmcvals.delay, CURSOR_MINIMUM_DELAY,
-                                    CURSOR_MAX_DELAY, 1, 5, 0, 1, 0);
-  gtk_widget_show (tmpwidget);
+
+  gimp_help_set_help_data (box,
+                           _("Enter time span in milliseconds in which "
+                             "each frame is rendered."),
+                           NULL);
+
+  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);
+  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*/
   gtk_box_pack_start (GTK_BOX (box), tmpwidget, TRUE, TRUE, 0);
+  gtk_widget_show (tmpwidget);
+
   g_signal_connect (adjustment, "value-changed",
                     G_CALLBACK (gimp_int_adjustment_update),
                     &xmcvals.delay);
+
   /* appended "ms" */
   tmpwidget = gtk_label_new ("ms");
   gtk_misc_set_alignment (GTK_MISC (tmpwidget), 0, 0.5); /*align left*/
   gtk_box_pack_start (GTK_BOX (box), tmpwidget, TRUE, TRUE, 0);
   gtk_widget_show (tmpwidget);
-  /* tooltip */
-  gimp_help_set_help_data (box,
-                           _("Enter time span in milliseconds in which "
-                             "each frame is rendered."),
-                        NULL);
-  gimp_table_attach_aligned (GTK_TABLE (table), 0, 4, _("_Delay:"),
-                             0, 0.5, box, 3, TRUE);
+
   /* Replace delay? */
   tmpwidget =
     gimp_int_radio_group_new (FALSE, NULL, G_CALLBACK (gimp_radio_button_update),
diff --git a/plug-ins/common/screenshot.c b/plug-ins/common/screenshot.c
index 57069d9..7d96338 100644
--- a/plug-ins/common/screenshot.c
+++ b/plug-ins/common/screenshot.c
@@ -1193,22 +1193,22 @@ shoot_radio_button_toggled (GtkWidget *widget,
 static gboolean
 shoot_dialog (GdkScreen **screen)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *notebook;
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *label;
-  GtkWidget *button;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *notebook;
+  GtkWidget     *frame;
+  GtkWidget     *vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *label;
+  GtkWidget     *button;
 #if (defined (HAVE_XFIXES) || defined (HAVE_X11_XMU_WINUTIL_H) || defined (PLATFORM_OSX))
-  GtkWidget *toggle;
+  GtkWidget     *toggle;
 #endif
-  GtkWidget *spinner;
-  GdkPixbuf *pixbuf;
-  GSList    *radio_group = NULL;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *spinner;
+  GdkPixbuf     *pixbuf;
+  GSList        *radio_group = NULL;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
@@ -1379,8 +1379,11 @@ shoot_dialog (GdkScreen **screen)
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  spinner = gimp_spin_button_new (&adj, shootvals.select_delay,
-                                  0.0, 100.0, 1.0, 5.0, 0.0, 0, 0);
+  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);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinner), TRUE);
   gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0);
   gtk_widget_show (spinner);
 
diff --git a/plug-ins/common/unit-editor.c b/plug-ins/common/unit-editor.c
index dfa5aff..b387695 100644
--- a/plug-ins/common/unit-editor.c
+++ b/plug-ins/common/unit-editor.c
@@ -187,20 +187,20 @@ static GimpUnit
 new_unit_dialog (GtkWidget *main_dialog,
                  GimpUnit   template)
 {
-  GtkWidget *dialog;
-  GtkWidget *table;
-  GtkWidget *entry;
-  GtkWidget *spinbutton;
+  GtkWidget     *dialog;
+  GtkWidget     *table;
+  GtkWidget     *entry;
+  GtkWidget     *spinbutton;
 
-  GtkWidget *identifier_entry;
-  GtkObject *factor_adj;
-  GtkObject *digits_adj;
-  GtkWidget *symbol_entry;
-  GtkWidget *abbreviation_entry;
-  GtkWidget *singular_entry;
-  GtkWidget *plural_entry;
+  GtkWidget     *identifier_entry;
+  GtkAdjustment *factor_adj;
+  GtkAdjustment *digits_adj;
+  GtkWidget     *symbol_entry;
+  GtkWidget     *abbreviation_entry;
+  GtkWidget     *singular_entry;
+  GtkWidget     *plural_entry;
 
-  GimpUnit   unit = GIMP_UNIT_PIXEL;
+  GimpUnit       unit = GIMP_UNIT_PIXEL;
 
   dialog = gimp_dialog_new (_("Add a New Unit"), PLUG_IN_ROLE,
                             main_dialog, GTK_DIALOG_MODAL,
@@ -236,21 +236,25 @@ new_unit_dialog (GtkWidget *main_dialog,
 
   gimp_help_set_help_data (entry, gettext (columns[IDENTIFIER].help), NULL);
 
-  spinbutton = gimp_spin_button_new (&factor_adj,
-                                     (template != GIMP_UNIT_PIXEL) ?
-                                     gimp_unit_get_factor (template) : 1.0,
-                                     GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION,
-                                     0.01, 0.1, 0.0, 0.01, 5);
+  factor_adj = (GtkAdjustment *)
+    gtk_adjustment_new ((template != GIMP_UNIT_PIXEL) ?
+                        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);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
                              _("_Factor:"), 0.0, 0.5,
                              spinbutton, 1, TRUE);
 
   gimp_help_set_help_data (spinbutton, gettext (columns[FACTOR].help), NULL);
 
-  spinbutton = gimp_spin_button_new (&digits_adj,
-                                     (template != GIMP_UNIT_PIXEL) ?
-                                     gimp_unit_get_digits (template) : 2.0,
-                                     0, 5, 1, 1, 0, 1, 0);
+  digits_adj = (GtkAdjustment *)
+    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);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
                              _("_Digits:"), 0.0, 0.5,
                              spinbutton, 1, TRUE);
diff --git a/plug-ins/common/web-page.c b/plug-ins/common/web-page.c
index 1a9623d..6e069a4 100644
--- a/plug-ins/common/web-page.c
+++ b/plug-ins/common/web-page.c
@@ -211,19 +211,19 @@ run (const gchar      *name,
 static gboolean
 webpage_dialog (void)
 {
-  GtkWidget *dialog;
-  GtkWidget *hbox;
-  GtkWidget *vbox;
-  GtkWidget *image;
-  GtkWidget *label;
-  GtkWidget *entry;
-  GtkSizeGroup *sizegroup;
-  GtkObject *adjustment;
-  GtkWidget *spinbutton;
-  GtkWidget *combo;
-  gint active;
-  gint status;
-  gboolean ret = FALSE;
+  GtkWidget     *dialog;
+  GtkWidget     *hbox;
+  GtkWidget     *vbox;
+  GtkWidget     *image;
+  GtkWidget     *label;
+  GtkWidget     *entry;
+  GtkSizeGroup  *sizegroup;
+  GtkAdjustment *adjustment;
+  GtkWidget     *spinbutton;
+  GtkWidget     *combo;
+  gint           active;
+  gint           status;
+  gboolean       ret = FALSE;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
@@ -290,9 +290,11 @@ webpage_dialog (void)
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
 
-  spinbutton = gimp_spin_button_new (&adjustment, webpagevals.width,
-                                     1, 8192,
-                                     1, 10, 0, 1, 0);
+  adjustment = (GtkAdjustment *)
+    gtk_adjustment_new (webpagevals.width,
+                        1, 8192, 1, 10, 0);
+  spinbutton = gtk_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/win-snap/winsnap.c b/plug-ins/win-snap/winsnap.c
index 0402e94..54b55a3 100644
--- a/plug-ins/win-snap/winsnap.c
+++ b/plug-ins/win-snap/winsnap.c
@@ -844,15 +844,15 @@ snap_toggle_update (GtkWidget *widget,
 static gboolean
 snap_dialog (void)
 {
-  GtkWidget *dialog;
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *label;
-  GtkObject *adj;
-  GSList    *radio_group = NULL;
-  gint      radio_pressed[2];
-  gint      decorations;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *label;
+  GtkAdjustment *adj;
+  GSList        *radio_group = NULL;
+  gint          radio_pressed[2];
+  gint          decorations;
+  gboolean       run;
 
   /* Set defaults */
   radio_pressed[0] = (winsnapvals.root == FALSE);
@@ -919,10 +919,10 @@ snap_dialog (void)
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
 
-  winsnapintf.delay_spinner = gimp_spin_button_new (&adj,
-                                                    winsnapvals.delay,
-                                                    0.0, 100.0,
-                                                    1.0, 5.0, 0.0, 0, 0);
+  adj = (GtkAdjustment *) gtk_adjustment_new (winsnapvals.delay,
+                                              0.0, 100.0, 1.0, 5.0, 0.0);
+  winsnapintf.delay_spinner = gtk_spin_button_new (adj,0, 0);
+  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (winsnapintf.delay_spinner), TRUE);
   gtk_box_pack_start (GTK_BOX (hbox),
                       winsnapintf.delay_spinner, FALSE, FALSE, 0);
   gtk_widget_show (winsnapintf.delay_spinner);


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