[gimp/gtk3-port: 111/249] plug-ins: s/GtkObject/GtkAdjustment/g in plug-ins/common/



commit 709a5414d4684c57f314690b7321334d227412d7
Author: Michael Natterer <mitch gimp org>
Date:   Mon Oct 25 01:26:00 2010 +0200

    plug-ins: s/GtkObject/GtkAdjustment/g in plug-ins/common/

 plug-ins/common/alien-map.c       |   52 +++++++++++++-------------
 plug-ins/common/align-layers.c    |   12 +++---
 plug-ins/common/curve-bend.c      |   32 ++++++++--------
 plug-ins/common/file-gih.c        |   60 +++++++++++++++---------------
 plug-ins/common/file-ps.c         |   59 +++++++++++++++---------------
 plug-ins/common/file-raw.c        |   20 +++++-----
 plug-ins/common/file-svg.c        |   48 ++++++++++++------------
 plug-ins/common/file-wmf.c        |   40 ++++++++++----------
 plug-ins/common/file-xbm.c        |   18 +++++-----
 plug-ins/common/file-xmc.c        |   24 ++++++------
 plug-ins/common/file-xpm.c        |    8 ++--
 plug-ins/common/film.c            |   50 +++++++++++++-------------
 plug-ins/common/filter-pack.c     |   24 ++++++-------
 plug-ins/common/fractal-trace.c   |   16 ++++----
 plug-ins/common/illusion.c        |   18 +++++-----
 plug-ins/common/iwarp.c           |   30 ++++++++--------
 plug-ins/common/jigsaw.c          |   20 +++++-----
 plug-ins/common/lens-apply.c      |   20 +++++-----
 plug-ins/common/lens-distortion.c |   14 ++++----
 plug-ins/common/mosaic.c          |   22 ++++++------
 plug-ins/common/newsprint.c       |   70 ++++++++++++++++++------------------
 plug-ins/common/nl-filter.c       |   20 +++++-----
 plug-ins/common/noise-hsv.c       |   12 +++---
 plug-ins/common/noise-randomize.c |   16 ++++----
 plug-ins/common/noise-rgb.c       |   12 +++---
 plug-ins/common/noise-solid.c     |   20 +++++-----
 plug-ins/common/nova.c            |   16 ++++----
 plug-ins/common/oilify.c          |   18 +++++-----
 plug-ins/common/photocopy.c       |   12 +++---
 plug-ins/common/plasma.c          |   14 ++++----
 plug-ins/common/polar-coords.c    |   16 ++++----
 plug-ins/common/red-eye-removal.c |   12 +++---
 plug-ins/common/ripple.c          |   32 ++++++++--------
 plug-ins/common/sample-colorize.c |   22 ++++++------
 plug-ins/common/screenshot.c      |   28 +++++++-------
 plug-ins/common/sharpen.c         |   12 +++---
 plug-ins/common/sinus.c           |   32 ++++++++--------
 plug-ins/common/smooth-palette.c  |   16 ++++----
 plug-ins/common/softglow.c        |   12 +++---
 plug-ins/common/sparkle.c         |   20 +++++-----
 plug-ins/common/sphere-designer.c |   71 ++++++++++++++++++-------------------
 plug-ins/common/threshold-alpha.c |   12 +++---
 plug-ins/common/tile-glass.c      |   22 +++++------
 plug-ins/common/tile-paper.c      |   36 ++++++++----------
 plug-ins/common/tile-small.c      |   40 ++++++++++----------
 plug-ins/common/unit-editor.c     |   28 +++++++-------
 plug-ins/common/unsharp-mask.c    |   12 +++---
 plug-ins/common/value-propagate.c |   22 ++++++------
 plug-ins/common/van-gogh-lic.c    |   16 ++++----
 plug-ins/common/warp.c            |   28 +++++++-------
 plug-ins/common/waves.c           |   20 +++++-----
 plug-ins/common/whirl-pinch.c     |   12 +++---
 plug-ins/common/wind.c            |   28 +++++++-------
 53 files changed, 668 insertions(+), 678 deletions(-)
---
diff --git a/plug-ins/common/alien-map.c b/plug-ins/common/alien-map.c
index eac9ac2..2a37e67 100644
--- a/plug-ins/common/alien-map.c
+++ b/plug-ins/common/alien-map.c
@@ -113,25 +113,25 @@ static alienmap2_vals_t wvals =
   TRUE
 };
 
-static GimpDrawable *drawable         = NULL;
+static GimpDrawable  *drawable         = NULL;
 
-static GtkWidget    *toggle_modify_rh = NULL;
-static GtkWidget    *toggle_modify_gs = NULL;
-static GtkWidget    *toggle_modify_bl = NULL;
+static GtkWidget     *toggle_modify_rh = NULL;
+static GtkWidget     *toggle_modify_gs = NULL;
+static GtkWidget     *toggle_modify_bl = NULL;
 
-static GtkWidget    *label_freq_rh    = NULL;
-static GtkWidget    *label_freq_gs    = NULL;
-static GtkWidget    *label_freq_bl    = NULL;
-static GtkWidget    *label_phase_rh   = NULL;
-static GtkWidget    *label_phase_gs   = NULL;
-static GtkWidget    *label_phase_bl   = NULL;
+static GtkWidget     *label_freq_rh    = NULL;
+static GtkWidget     *label_freq_gs    = NULL;
+static GtkWidget     *label_freq_bl    = NULL;
+static GtkWidget     *label_phase_rh   = NULL;
+static GtkWidget     *label_phase_gs   = NULL;
+static GtkWidget     *label_phase_bl   = NULL;
 
-static GtkObject    *entry_freq_rh    = NULL;
-static GtkObject    *entry_freq_gs    = NULL;
-static GtkObject    *entry_freq_bl    = NULL;
-static GtkObject    *entry_phase_rh   = NULL;
-static GtkObject    *entry_phase_gs   = NULL;
-static GtkObject    *entry_phase_bl   = NULL;
+static GtkAdjustment *entry_freq_rh    = NULL;
+static GtkAdjustment *entry_freq_gs    = NULL;
+static GtkAdjustment *entry_freq_bl    = NULL;
+static GtkAdjustment *entry_phase_rh   = NULL;
+static GtkAdjustment *entry_phase_gs   = NULL;
+static GtkAdjustment *entry_phase_bl   = NULL;
 
 
 static const gchar *ctext[][2] =
@@ -376,16 +376,16 @@ alienmap2 (GimpDrawable *drawable)
 static gint
 alienmap2_dialog (void)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *top_table;
-  GtkWidget *frame;
-  GtkWidget *toggle;
-  GtkWidget *hbox;
-  GtkWidget *vbox;
-  GtkWidget *table;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *top_table;
+  GtkWidget     *frame;
+  GtkWidget     *toggle;
+  GtkWidget     *hbox;
+  GtkWidget     *vbox;
+  GtkWidget     *table;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/align-layers.c b/plug-ins/common/align-layers.c
index e863993..fa86ac3 100644
--- a/plug-ins/common/align-layers.c
+++ b/plug-ins/common/align-layers.c
@@ -387,12 +387,12 @@ align_layers_get_align_offsets (gint32  drawable_id,
 static int
 align_layers_dialog (void)
 {
-  GtkWidget *dialog;
-  GtkWidget *table;
-  GtkWidget *combo;
-  GtkWidget *toggle;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *table;
+  GtkWidget     *combo;
+  GtkWidget     *toggle;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/curve-bend.c b/plug-ins/common/curve-bend.c
index f2e9b64..d77f2c6 100644
--- a/plug-ins/common/curve-bend.c
+++ b/plug-ins/common/curve-bend.c
@@ -1162,22 +1162,22 @@ do_dialog (GimpDrawable *drawable)
 static BenderDialog *
 bender_new_dialog (GimpDrawable *drawable)
 {
-  BenderDialog *cd;
-  GtkWidget  *main_hbox;
-  GtkWidget  *vbox;
-  GtkWidget  *hbox;
-  GtkWidget  *vbox2;
-  GtkWidget  *abox;
-  GtkWidget  *frame;
-  GtkWidget  *upper, *lower;
-  GtkWidget  *smooth, *freew;
-  GtkWidget  *toggle;
-  GtkWidget  *button;
-  GtkWidget  *spinbutton;
-  GtkWidget  *label;
-  GtkObject  *data;
-  GdkDisplay *display;
-  gint        i, j;
+  BenderDialog  *cd;
+  GtkWidget     *main_hbox;
+  GtkWidget     *vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *vbox2;
+  GtkWidget     *abox;
+  GtkWidget     *frame;
+  GtkWidget     *upper, *lower;
+  GtkWidget     *smooth, *freew;
+  GtkWidget     *toggle;
+  GtkWidget     *button;
+  GtkWidget     *spinbutton;
+  GtkWidget     *label;
+  GtkAdjustment *data;
+  GdkDisplay    *display;
+  gint           i, j;
 
   cd = g_new (BenderDialog, 1);
 
diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c
index 2fd015d..adf4641 100644
--- a/plug-ins/common/file-gih.c
+++ b/plug-ins/common/file-gih.c
@@ -111,19 +111,19 @@ 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];
+  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;       */
@@ -793,10 +793,10 @@ size_adjustment_callback (GtkWidget *widget,
                           newn * *(adj->value) != size);
 
   if (adj->ncells != NULL)
-    gtk_adjustment_set_value (GTK_ADJUSTMENT (adj->ncells),
+    gtk_adjustment_set_value (adj->ncells,
                               *(adj->other_count) * *(adj->count));
   if (adj->rank0 != NULL)
-    gtk_adjustment_set_value (GTK_ADJUSTMENT (adj->rank0),
+    gtk_adjustment_set_value (adj->rank0,
                               *(adj->other_count) * *(adj->count));
 }
 
@@ -824,7 +824,7 @@ cb_callback (GtkWidget *widget,
 }
 
 static void
-dim_callback (GtkAdjustment *adjustment,
+dim_callback (GtkAdjustment      *adjustment,
               SizeAdjustmentData *data)
 {
   gint i;
@@ -841,22 +841,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];
+  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;
+  gint32        *layer_ID;
+  gint32         nlayers;
+  gboolean       run;
 
   dialog = gimp_export_dialog_new (_("Brush Pipe"), PLUG_IN_BINARY, SAVE_PROC);
 
diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c
index 479c642..3c35184 100644
--- a/plug-ins/common/file-ps.c
+++ b/plug-ins/common/file-ps.c
@@ -287,8 +287,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);
@@ -3069,21 +3069,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);
 
@@ -3323,16 +3323,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);
@@ -3544,10 +3544,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-raw.c b/plug-ins/common/file-raw.c
index cefcd20..3be256a 100644
--- a/plug-ins/common/file-raw.c
+++ b/plug-ins/common/file-raw.c
@@ -1036,16 +1036,16 @@ palette_update (GimpPreviewArea *preview)
 static gboolean
 load_dialog (const gchar *filename)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *table;
-  GtkWidget *frame;
-  GtkWidget *combo;
-  GtkWidget *button;
-  GtkObject *adj;
-  gint32     file_size;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkWidget     *frame;
+  GtkWidget     *combo;
+  GtkWidget     *button;
+  GtkAdjustment *adj;
+  gint32         file_size;
+  gboolean       run;
 
   file_size = get_file_info (filename);
 
diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c
index ae75baa..abea894 100644
--- a/plug-ins/common/file-svg.c
+++ b/plug-ins/common/file-svg.c
@@ -588,8 +588,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;
@@ -624,8 +624,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)))
     {
@@ -685,8 +685,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);
@@ -696,24 +696,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,
diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c
index 6775e5f..854f16c 100644
--- a/plug-ins/common/file-wmf.c
+++ b/plug-ins/common/file-wmf.c
@@ -371,8 +371,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;
@@ -407,8 +407,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)))
     {
@@ -466,8 +466,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);
@@ -476,20 +476,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 };
diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c
index 0017a1a..946781e 100644
--- a/plug-ins/common/file-xbm.c
+++ b/plug-ins/common/file-xbm.c
@@ -1172,15 +1172,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);
 
diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c
index d648b2d..34c722b 100644
--- a/plug-ins/common/file-xmc.c
+++ b/plug-ins/common/file-xmc.c
@@ -1040,18 +1040,18 @@ read32 (FILE *f, GError **error)
 static gboolean
 save_dialog (const gint32 image_ID, GimpParamRegion *hotspotRange)
 {
-  gint x1, x2, y1, y2;
-  GtkWidget      *dialog;
-  GtkWidget      *frame;
-  GtkWidget      *table;
-  GtkWidget      *box;
-  GtkObject      *adjustment;
-  GtkWidget      *alignment;
-  GtkWidget      *tmpwidget;
-  GtkWidget      *label;
-  GtkTextBuffer  *textbuffer;
-  GValue          val = {0,};
-  gboolean        run;
+  gint           x1, x2, y1, y2;
+  GtkWidget     *dialog;
+  GtkWidget     *frame;
+  GtkWidget     *table;
+  GtkWidget     *box;
+  GtkAdjustment *adjustment;
+  GtkWidget     *alignment;
+  GtkWidget     *tmpwidget;
+  GtkWidget     *label;
+  GtkTextBuffer *textbuffer;
+  GValue         val = { 0, };
+  gboolean       run;
 
   g_value_init (&val, G_TYPE_DOUBLE);
   dialog = gimp_export_dialog_new (_("X11 Mouse Cursor"), PLUG_IN_BINARY, SAVE_PROC);
diff --git a/plug-ins/common/file-xpm.c b/plug-ins/common/file-xpm.c
index 74cb913..8885a8e 100644
--- a/plug-ins/common/file-xpm.c
+++ b/plug-ins/common/file-xpm.c
@@ -796,10 +796,10 @@ save_image (const gchar  *filename,
 static gboolean
 save_dialog (void)
 {
-  GtkWidget *dialog;
-  GtkWidget *table;
-  GtkObject *scale_data;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *table;
+  GtkAdjustment *scale_data;
+  gboolean       run;
 
   dialog = gimp_export_dialog_new (_("XPM"), PLUG_IN_BINARY, SAVE_PROC);
 
diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c
index c7559ff..a4764d3 100644
--- a/plug-ins/common/film.c
+++ b/plug-ins/common/film.c
@@ -66,9 +66,9 @@ typedef struct
 /* Data to use for the dialog */
 typedef struct
 {
-  GtkObject    *advanced_adj[7];
-  GtkTreeModel *image_list_all;
-  GtkTreeModel *image_list_film;
+  GtkAdjustment *advanced_adj[7];
+  GtkTreeModel  *image_list_all;
+  GtkTreeModel  *image_list_film;
 } FilmInterface;
 
 
@@ -944,20 +944,20 @@ static void
 create_selection_tab (GtkWidget *notebook,
                       gint32     image_ID)
 {
-  GtkSizeGroup *group;
-  GtkWidget    *vbox;
-  GtkWidget    *vbox2;
-  GtkWidget    *hbox;
-  GtkWidget    *table;
-  GtkWidget    *label;
-  GtkWidget    *frame;
-  GtkWidget    *toggle;
-  GtkWidget    *spinbutton;
-  GtkObject    *adj;
-  GtkWidget    *button;
-  GtkWidget    *font_button;
-  gint32       *image_id_list;
-  gint          nimages, j;
+  GtkSizeGroup  *group;
+  GtkWidget     *vbox;
+  GtkWidget     *vbox2;
+  GtkWidget     *hbox;
+  GtkWidget     *table;
+  GtkWidget     *label;
+  GtkWidget     *frame;
+  GtkWidget     *toggle;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  GtkWidget     *button;
+  GtkWidget     *font_button;
+  gint32        *image_id_list;
+  gint           nimages, j;
 
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
@@ -1116,13 +1116,13 @@ create_selection_tab (GtkWidget *notebook,
 static void
 create_advanced_tab (GtkWidget *notebook)
 {
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *table;
-  GtkWidget *frame;
-  GtkObject *adj;
-  GtkWidget *button;
-  gint       row;
+  GtkWidget     *vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *table;
+  GtkWidget     *frame;
+  GtkAdjustment *adj;
+  GtkWidget     *button;
+  gint           row;
 
   frame = gimp_frame_new (_("All Values are Fractions of the Strip Height"));
   gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
@@ -1315,7 +1315,7 @@ film_reset_callback (GtkWidget *widget,
   gint i;
 
   for (i = 0; i < G_N_ELEMENTS (advanced_defaults) ; i++)
-    gtk_adjustment_set_value (GTK_ADJUSTMENT (filmint.advanced_adj[i]),
+    gtk_adjustment_set_value (filmint.advanced_adj[i],
                               advanced_defaults[i]);
 }
 
diff --git a/plug-ins/common/filter-pack.c b/plug-ins/common/filter-pack.c
index 399d449..8532a25 100644
--- a/plug-ins/common/filter-pack.c
+++ b/plug-ins/common/filter-pack.c
@@ -624,8 +624,8 @@ fp_create_circle_palette (GtkWidget *parent)
 static GtkWidget *
 fp_create_rough (void)
 {
-  GtkWidget *frame, *vbox, *scale;
-  GtkObject *data;
+  GtkWidget     *frame, *vbox, *scale;
+  GtkAdjustment *data;
 
   frame = gimp_frame_new (_("Roughness"));
   gtk_widget_show (frame);
@@ -635,7 +635,7 @@ fp_create_rough (void)
   gtk_widget_show (vbox);
 
   data = gtk_adjustment_new (fpvals.roughness, 0, 1.0, 0.05, 0.01, 0.0);
-  fp_widgets.roughness_scale = scale = gtk_hscale_new (GTK_ADJUSTMENT (data));
+  fp_widgets.roughness_scale = scale = gtk_hscale_new (data);
 
   gtk_widget_set_size_request (scale, 60, -1);
   gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
@@ -1290,12 +1290,12 @@ fp_advanced_dialog (GtkWidget *parent)
   const gchar *rangeNames[] = { N_("Shadows:"),
                                 N_("Midtones:"),
                                 N_("Highlights:") };
-  GtkWidget *frame, *hbox;
-  GtkObject *smoothnessData;
-  GtkWidget *graphFrame, *scale;
-  GtkWidget *vbox, *label, *labelTable, *alignment;
-  GtkWidget *inner_vbox, *innermost_vbox;
-  gint       i;
+  GtkWidget     *frame, *hbox;
+  GtkAdjustment *smoothnessData;
+  GtkWidget     *graphFrame, *scale;
+  GtkWidget     *vbox, *label, *labelTable, *alignment;
+  GtkWidget     *inner_vbox, *innermost_vbox;
+  gint           i;
 
   AW.window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
@@ -1399,8 +1399,7 @@ fp_advanced_dialog (GtkWidget *parent)
   smoothnessData = gtk_adjustment_new (fpvals.aliasing,
                                        0, 1.0, 0.05, 0.01, 0.0);
 
-  fp_widgets.aliasing_scale = scale =
-    gtk_hscale_new (GTK_ADJUSTMENT (smoothnessData));
+  fp_widgets.aliasing_scale = scale = gtk_hscale_new (smoothnessData);
   gtk_widget_set_size_request (scale, 200, -1);
   gtk_scale_set_digits (GTK_SCALE (scale), 2);
   gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
@@ -1425,8 +1424,7 @@ fp_advanced_dialog (GtkWidget *parent)
                                        50, MAX_PREVIEW_SIZE,
                                        5, 5, 0.0);
 
-  fp_widgets.preview_size_scale = scale =
-    gtk_hscale_new (GTK_ADJUSTMENT (smoothnessData));
+  fp_widgets.preview_size_scale = scale = gtk_hscale_new (smoothnessData);
   gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
   gtk_widget_set_size_request (scale, 100, -1);
   gtk_scale_set_digits (GTK_SCALE (scale), 0);
diff --git a/plug-ins/common/fractal-trace.c b/plug-ins/common/fractal-trace.c
index 14f8d17..f88b9ab 100644
--- a/plug-ins/common/fractal-trace.c
+++ b/plug-ins/common/fractal-trace.c
@@ -676,14 +676,14 @@ dialog_outside_type_callback (GtkWidget *widget,
 static gboolean
 dialog_show (void)
 {
-  GtkWidget *dialog;
-  GtkWidget *mainbox;
-  GtkWidget *hbox;
-  GtkWidget *table;
-  GtkWidget *frame;
-  GtkWidget *abox;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *mainbox;
+  GtkWidget     *hbox;
+  GtkWidget     *table;
+  GtkWidget     *frame;
+  GtkWidget     *abox;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/illusion.c b/plug-ins/common/illusion.c
index 4a0306c..c2690d1 100644
--- a/plug-ins/common/illusion.c
+++ b/plug-ins/common/illusion.c
@@ -334,15 +334,15 @@ illusion_preview (GimpPreview  *preview,
 static gboolean
 illusion_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *table;
-  GtkWidget *spinbutton;
-  GtkObject *adj;
-  GtkWidget *radio;
-  GSList    *group = NULL;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  GtkWidget     *radio;
+  GSList        *group = NULL;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c
index 1c54ec5..73005df 100644
--- a/plug-ins/common/iwarp.c
+++ b/plug-ins/common/iwarp.c
@@ -1013,11 +1013,11 @@ static void
 iwarp_animate_dialog (GtkWidget *dialog,
                       GtkWidget *notebook)
 {
-  GtkWidget *frame;
-  GtkWidget *vbox;
-  GtkWidget *table;
-  GtkWidget *button;
-  GtkObject *scale_data;
+  GtkWidget     *frame;
+  GtkWidget     *vbox;
+  GtkWidget     *table;
+  GtkWidget     *button;
+  GtkAdjustment *scale_data;
 
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
@@ -1083,16 +1083,16 @@ static void
 iwarp_settings_dialog (GtkWidget *dialog,
                        GtkWidget *notebook)
 {
-  GtkWidget *vbox;
-  GtkWidget *vbox2;
-  GtkWidget *vbox3;
-  GtkWidget *hbox;
-  GtkWidget *frame;
-  GtkWidget *button;
-  GtkWidget *table;
-  GtkObject *scale_data;
-  GtkWidget *widget[3];
-  gint       i;
+  GtkWidget     *vbox;
+  GtkWidget     *vbox2;
+  GtkWidget     *vbox3;
+  GtkWidget     *hbox;
+  GtkWidget     *frame;
+  GtkWidget     *button;
+  GtkWidget     *table;
+  GtkAdjustment *scale_data;
+  GtkWidget     *widget[3];
+  gint           i;
 
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c
index adeace1..496c893 100644
--- a/plug-ins/common/jigsaw.c
+++ b/plug-ins/common/jigsaw.c
@@ -2399,16 +2399,16 @@ check_config (gint width,
 static gboolean
 jigsaw_dialog (GimpDrawable *drawable)
 {
-  GtkWidget    *dialog;
-  GtkWidget    *main_vbox;
-  GtkWidget    *preview;
-  GtkSizeGroup *group;
-  GtkWidget    *frame;
-  GtkWidget    *rbutton1;
-  GtkWidget    *rbutton2;
-  GtkWidget    *table;
-  GtkObject    *adj;
-  gboolean      run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkSizeGroup  *group;
+  GtkWidget     *frame;
+  GtkWidget     *rbutton1;
+  GtkWidget     *rbutton2;
+  GtkWidget     *table;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/lens-apply.c b/plug-ins/common/lens-apply.c
index 59d9da6..223e88b 100644
--- a/plug-ins/common/lens-apply.c
+++ b/plug-ins/common/lens-apply.c
@@ -376,16 +376,16 @@ drawlens (GimpDrawable *drawable,
 static gboolean
 lens_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *label;
-  GtkWidget *toggle;
-  GtkWidget *hbox;
-  GtkWidget *vbox;
-  GtkWidget *spinbutton;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *label;
+  GtkWidget     *toggle;
+  GtkWidget     *hbox;
+  GtkWidget     *vbox;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/lens-distortion.c b/plug-ins/common/lens-distortion.c
index bd2d2e3..fa28613 100644
--- a/plug-ins/common/lens-distortion.c
+++ b/plug-ins/common/lens-distortion.c
@@ -467,13 +467,13 @@ lens_response (GtkWidget *widget,
 static gboolean
 lens_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *table;
-  GtkWidget *preview;
-  GtkObject *adj;
-  gint       row = 0;
-  gboolean   run = FALSE;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *table;
+  GtkWidget     *preview;
+  GtkAdjustment *adj;
+  gint           row = 0;
+  gboolean       run = FALSE;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/mosaic.c b/plug-ins/common/mosaic.c
index 2522b6b..244fa27 100644
--- a/plug-ins/common/mosaic.c
+++ b/plug-ins/common/mosaic.c
@@ -575,17 +575,17 @@ mosaic (GimpDrawable *drawable,
 static gboolean
 mosaic_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *toggle;
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *combo;
-  GtkWidget *table;
-  GtkObject *scale_data;
-  gint       row = 0;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *toggle;
+  GtkWidget     *vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *combo;
+  GtkWidget     *table;
+  GtkAdjustment *scale_data;
+  gint           row = 0;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c
index e36ba29..5fa71d6 100644
--- a/plug-ins/common/newsprint.c
+++ b/plug-ins/common/newsprint.c
@@ -227,15 +227,15 @@ typedef struct _channel_st channel_st;
 
 struct _channel_st
 {
-  GtkWidget   *vbox;             /* vbox of this channel */
-  gint        *spotfn_num;       /* which spotfn the menu is controlling */
-  preview_st   prev[3];          /* state for 3 preview widgets */
-  GtkObject   *angle_adj;        /* angle adjustment */
-  GtkWidget   *combo;            /* popup for spot function */
-  GtkWidget   *menuitem[NUM_SPOTFN]; /* menuitems for each spot function */
-  GtkWidget   *ch_menuitem;      /* menuitem for the channel selector */
-  gint         ch_menu_num;      /* this channel's position in the selector */
-  channel_st  *next;             /* circular list of channels in locked group */
+  GtkWidget     *vbox;             /* vbox of this channel */
+  gint          *spotfn_num;       /* which spotfn the menu is controlling */
+  preview_st     prev[3];          /* state for 3 preview widgets */
+  GtkAdjustment *angle_adj;        /* angle adjustment */
+  GtkWidget     *combo;            /* popup for spot function */
+  GtkWidget     *menuitem[NUM_SPOTFN]; /* menuitems for each spot function */
+  GtkWidget     *ch_menuitem;      /* menuitem for the channel selector */
+  gint           ch_menu_num;      /* this channel's position in the selector */
+  channel_st    *next;             /* circular list of channels in locked group */
 };
 
 
@@ -243,18 +243,18 @@ struct _channel_st
  * callback functions */
 typedef struct
 {
-  GtkWidget  *pull_table;
-  GtkObject  *pull;            /* black pullout percentage */
-  GtkObject  *input_spi;
-  GtkObject  *output_lpi;
-  GtkObject  *cellsize;
-  GtkWidget  *vbox;            /* container for screen info */
+  GtkWidget     *pull_table;
+  GtkAdjustment *pull;            /* black pullout percentage */
+  GtkAdjustment *input_spi;
+  GtkAdjustment *output_lpi;
+  GtkAdjustment *cellsize;
+  GtkWidget     *vbox;            /* container for screen info */
 
   /* Notebook for the channels (one per colorspace) */
-  GtkWidget  *channel_notebook[NUM_CS];
+  GtkWidget     *channel_notebook[NUM_CS];
 
   /* room for up to 4 channels per colourspace */
-  channel_st *chst[NUM_CS][4];
+  channel_st    *chst[NUM_CS][4];
 } NewsprintDialog_st;
 
 
@@ -842,7 +842,7 @@ angle_callback (GtkAdjustment *adjustment,
 
       while (c != st)
         {
-          gtk_adjustment_set_value (GTK_ADJUSTMENT (c->angle_adj), *angle_ptr);
+          gtk_adjustment_set_value (c->angle_adj, *angle_ptr);
           c = c->next;
         }
 
@@ -862,7 +862,7 @@ lpi_callback (GtkAdjustment *adjustment,
                                    cellsize_callback,
                                    data);
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (st->cellsize),
+  gtk_adjustment_set_value (st->cellsize,
                             pvals_ui.input_spi / pvals_ui.output_lpi);
 
   g_signal_handlers_unblock_by_func (st->cellsize,
@@ -882,7 +882,7 @@ spi_callback (GtkAdjustment *adjustment,
                                    lpi_callback,
                                    data);
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (st->output_lpi),
+  gtk_adjustment_set_value (st->output_lpi,
                             pvals_ui.input_spi / pvals.cell_width);
 
   g_signal_handlers_unblock_by_func (st->output_lpi,
@@ -902,7 +902,7 @@ cellsize_callback (GtkAdjustment *adjustment,
                                    lpi_callback,
                                    data);
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (st->output_lpi),
+  gtk_adjustment_set_value (st->output_lpi,
                             pvals_ui.input_spi / pvals.cell_width);
 
   g_signal_handlers_unblock_by_func (st->output_lpi,
@@ -939,7 +939,7 @@ newsprint_defaults_callback (GtkWidget *widget,
       c = 0;
       while (ct->name)
         {
-          gtk_adjustment_set_value (GTK_ADJUSTMENT (chst[c]->angle_adj),
+          gtk_adjustment_set_value (chst[c]->angle_adj,
                                     *(ct->factory_angle));
 
           /* change the popup menu and also activate the menuitem in
@@ -1137,19 +1137,19 @@ newsprint_dialog (GimpDrawable *drawable)
 {
   /* widgets we need from callbacks stored here */
   NewsprintDialog_st st;
-  GtkWidget *dialog;
-  GtkWidget *paned;
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *preview;
-  GtkWidget *frame;
-  GtkWidget *table;
-  GtkObject *adj;
-  GSList    *group = NULL;
-  gint       bpp;
-  gint       i;
-  gdouble    xres, yres;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *paned;
+  GtkWidget     *vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *preview;
+  GtkWidget     *frame;
+  GtkWidget     *table;
+  GtkAdjustment *adj;
+  GSList        *group = NULL;
+  gint           bpp;
+  gint           i;
+  gdouble        xres, yres;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/nl-filter.c b/plug-ins/common/nl-filter.c
index c53f2ed..af76e3b 100644
--- a/plug-ins/common/nl-filter.c
+++ b/plug-ins/common/nl-filter.c
@@ -999,16 +999,16 @@ nlfilter (GimpDrawable *drawable,
 static gboolean
 nlfilter_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *frame;
-  GtkWidget *alpha_trim;
-  GtkWidget *opt_est;
-  GtkWidget *edge_enhance;
-  GtkWidget *table;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *frame;
+  GtkWidget     *alpha_trim;
+  GtkWidget     *opt_est;
+  GtkWidget     *edge_enhance;
+  GtkWidget     *table;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/noise-hsv.c b/plug-ins/common/noise-hsv.c
index 4ca5cd1..5c22a06 100644
--- a/plug-ins/common/noise-hsv.c
+++ b/plug-ins/common/noise-hsv.c
@@ -351,12 +351,12 @@ scatter_hsv_preview (GimpPreview *preview)
 static gboolean
 scatter_hsv_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *table;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/noise-randomize.c b/plug-ins/common/noise-randomize.c
index 3548443..85b0c69 100644
--- a/plug-ins/common/noise-randomize.c
+++ b/plug-ins/common/noise-randomize.c
@@ -717,14 +717,14 @@ randomize (GimpDrawable *drawable,
 static gboolean
 randomize_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dlg;
-  GtkWidget *table;
-  GtkWidget *label;
-  GtkWidget *seed_hbox;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dlg;
+  GtkWidget     *table;
+  GtkWidget     *label;
+  GtkWidget     *seed_hbox;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/noise-rgb.c b/plug-ins/common/noise-rgb.c
index c85ceb4..04a07be 100644
--- a/plug-ins/common/noise-rgb.c
+++ b/plug-ins/common/noise-rgb.c
@@ -55,8 +55,8 @@ typedef struct
 
 typedef struct
 {
-  gint       channels;
-  GtkObject *channel_adj[4];
+  gint           channels;
+  GtkAdjustment *channel_adj[4];
 } NoisifyInterface;
 
 
@@ -385,7 +385,7 @@ noisify_add_channel (GtkWidget    *table,
                      GimpDrawable *drawable,
                      GtkWidget    *preview)
 {
-  GtkObject *adj;
+  GtkAdjustment *adj;
 
   adj = gimp_scale_entry_new (GTK_TABLE (table), 0, channel + 1,
                               name, SCALE_WIDTH, 0,
@@ -412,7 +412,7 @@ noisify_add_alpha_channel (GtkWidget    *table,
                            GimpDrawable *drawable,
                            GtkWidget    *preview)
 {
-  GtkObject *adj;
+  GtkAdjustment *adj;
 
   adj = gimp_scale_entry_new (GTK_TABLE (table), 0, channel + 1,
                               name, SCALE_WIDTH, 0,
@@ -619,8 +619,8 @@ noisify_double_adjustment_update (GtkAdjustment *adjustment,
         }
 
       for (i = 0; i < n; i++)
-        if (adjustment != GTK_ADJUSTMENT (noise_int.channel_adj[i]))
-          gtk_adjustment_set_value (GTK_ADJUSTMENT (noise_int.channel_adj[i]),
+        if (adjustment != noise_int.channel_adj[i])
+          gtk_adjustment_set_value (noise_int.channel_adj[i],
                                     gtk_adjustment_get_value (adjustment));
     }
 }
diff --git a/plug-ins/common/noise-solid.c b/plug-ins/common/noise-solid.c
index e88e9a7..e4834dc 100644
--- a/plug-ins/common/noise-solid.c
+++ b/plug-ins/common/noise-solid.c
@@ -545,16 +545,16 @@ noise (gdouble x,
 static gboolean
 solid_noise_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *toggle;
-  GtkWidget *table;
-  GtkWidget *label;
-  GtkWidget *seed_hbox;
-  GtkWidget *spinbutton;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *toggle;
+  GtkWidget     *table;
+  GtkWidget     *label;
+  GtkWidget     *seed_hbox;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/nova.c b/plug-ins/common/nova.c
index fe59f31..ad6ce66 100644
--- a/plug-ins/common/nova.c
+++ b/plug-ins/common/nova.c
@@ -284,14 +284,14 @@ run (const gchar      *name,
 static gboolean
 nova_dialog (GimpDrawable *drawable)
 {
-  GtkWidget  *dialog;
-  GtkWidget  *main_vbox;
-  GtkWidget  *preview;
-  GtkWidget  *frame;
-  GtkWidget  *table;
-  GtkWidget  *button;
-  GtkObject  *adj;
-  gboolean    run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *frame;
+  GtkWidget     *table;
+  GtkWidget     *button;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/oilify.c b/plug-ins/common/oilify.c
index 5b257be..d7b62a4 100644
--- a/plug-ins/common/oilify.c
+++ b/plug-ins/common/oilify.c
@@ -756,15 +756,15 @@ oilify_map_constrain (gint32   image_id G_GNUC_UNUSED,
 static gint
 oilify_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *table;
-  GtkWidget *toggle;
-  GtkWidget *combo;
-  GtkObject *adj;
-  gboolean   can_use_mode_inten;
-  gboolean   ret;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkWidget     *toggle;
+  GtkWidget     *combo;
+  GtkAdjustment *adj;
+  gboolean       can_use_mode_inten;
+  gboolean       ret;
 
   can_use_mode_inten = gimp_drawable_is_rgb (drawable->drawable_id);
 
diff --git a/plug-ins/common/photocopy.c b/plug-ins/common/photocopy.c
index ae14b12..d075175 100644
--- a/plug-ins/common/photocopy.c
+++ b/plug-ins/common/photocopy.c
@@ -826,12 +826,12 @@ find_constants (gdouble n_p[],
 static gboolean
 photocopy_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *table;
-  GtkObject *scale_data;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkAdjustment *scale_data;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/plasma.c b/plug-ins/common/plasma.c
index 7b0f82f..7cf9e0f 100644
--- a/plug-ins/common/plasma.c
+++ b/plug-ins/common/plasma.c
@@ -286,13 +286,13 @@ run (const gchar      *name,
 static gboolean
 plasma_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *label;
-  GtkWidget *table;
-  GtkWidget *seed;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *label;
+  GtkWidget     *table;
+  GtkWidget     *seed;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/polar-coords.c b/plug-ins/common/polar-coords.c
index 143325b..dbd985c 100644
--- a/plug-ins/common/polar-coords.c
+++ b/plug-ins/common/polar-coords.c
@@ -578,14 +578,14 @@ calc_undistorted_coords (gdouble  wx,
 static gboolean
 polarize_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *table;
-  GtkWidget *hbox;
-  GtkWidget *toggle;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkWidget     *hbox;
+  GtkWidget     *toggle;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/red-eye-removal.c b/plug-ins/common/red-eye-removal.c
index 83c6c89..343a68d 100644
--- a/plug-ins/common/red-eye-removal.c
+++ b/plug-ins/common/red-eye-removal.c
@@ -129,12 +129,12 @@ static gboolean
 dialog (gint32        image_id,
         GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *preview;
-  GtkWidget *table;
-  GtkWidget *main_vbox;
-  GtkObject *adj;
-  gboolean   run = FALSE;
+  GtkWidget     *dialog;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkWidget     *main_vbox;
+  GtkAdjustment *adj;
+  gboolean       run = FALSE;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/ripple.c b/plug-ins/common/ripple.c
index 61c0b9e..036f3f2 100644
--- a/plug-ins/common/ripple.c
+++ b/plug-ins/common/ripple.c
@@ -462,22 +462,22 @@ ripple (GimpDrawable *drawable,
 static gboolean
 ripple_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *toggle;
-  GtkWidget *toggle_vbox;
-  GtkWidget *frame;
-  GtkWidget *table;
-  GtkObject *scale_data;
-  GtkWidget *horizontal;
-  GtkWidget *vertical;
-  GtkWidget *wrap;
-  GtkWidget *smear;
-  GtkWidget *blank;
-  GtkWidget *sawtooth;
-  GtkWidget *sine;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *toggle;
+  GtkWidget     *toggle_vbox;
+  GtkWidget     *frame;
+  GtkWidget     *table;
+  GtkAdjustment *scale_data;
+  GtkWidget     *horizontal;
+  GtkWidget     *vertical;
+  GtkWidget     *wrap;
+  GtkWidget     *smear;
+  GtkWidget     *blank;
+  GtkWidget     *sawtooth;
+  GtkWidget     *sine;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/sample-colorize.c b/plug-ins/common/sample-colorize.c
index c23ce2d..28c6ea0 100644
--- a/plug-ins/common/sample-colorize.c
+++ b/plug-ins/common/sample-colorize.c
@@ -1292,17 +1292,17 @@ level_out_events (GtkWidget *widget,
 static void
 smp_dialog (void)
 {
-  GtkWidget *dialog;
-  GtkWidget *hbox;
-  GtkWidget *vbox2;
-  GtkWidget *frame;
-  GtkWidget *table;
-  GtkWidget *check_button;
-  GtkWidget *label;
-  GtkWidget *combo;
-  GtkWidget *spinbutton;
-  GtkObject *data;
-  gint       ty;
+  GtkWidget     *dialog;
+  GtkWidget     *hbox;
+  GtkWidget     *vbox2;
+  GtkWidget     *frame;
+  GtkWidget     *table;
+  GtkWidget     *check_button;
+  GtkWidget     *label;
+  GtkWidget     *combo;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *data;
+  gint           ty;
 
   /* set flags for check buttons from mode value bits */
   if (g_Sdebug)
diff --git a/plug-ins/common/screenshot.c b/plug-ins/common/screenshot.c
index 5b016a5..718d458 100644
--- a/plug-ins/common/screenshot.c
+++ b/plug-ins/common/screenshot.c
@@ -1044,20 +1044,20 @@ 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 *toggle;
-  GtkWidget *spinner;
-  GdkPixbuf *pixbuf;
-  GSList    *radio_group = NULL;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *notebook;
+  GtkWidget     *frame;
+  GtkWidget     *vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *label;
+  GtkWidget     *button;
+  GtkWidget     *toggle;
+  GtkWidget     *spinner;
+  GdkPixbuf     *pixbuf;
+  GSList        *radio_group = NULL;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/sharpen.c b/plug-ins/common/sharpen.c
index e7e83de..53d1501 100644
--- a/plug-ins/common/sharpen.c
+++ b/plug-ins/common/sharpen.c
@@ -461,12 +461,12 @@ sharpen (GimpDrawable *drawable)
 static gboolean
 sharpen_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *table;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/sinus.c b/plug-ins/common/sinus.c
index ef0fb04..71e89ef 100644
--- a/plug-ins/common/sinus.c
+++ b/plug-ins/common/sinus.c
@@ -623,22 +623,22 @@ sinus_random_update (GObject   *unused,
 static gint
 sinus_dialog (void)
 {
-  GtkWidget *dlg;
-  GtkWidget *main_hbox;
-  GtkWidget *preview;
-  GtkWidget *notebook;
-  GtkWidget *page;
-  GtkWidget *frame;
-  GtkWidget *label;
-  GtkWidget *vbox;
-  GtkWidget *vbox2;
-  GtkWidget *hbox;
-  GtkWidget *table;
-  GtkWidget *toggle;
-  GtkWidget *push_col1 = NULL;
-  GtkWidget *push_col2 = NULL;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dlg;
+  GtkWidget     *main_hbox;
+  GtkWidget     *preview;
+  GtkWidget     *notebook;
+  GtkWidget     *page;
+  GtkWidget     *frame;
+  GtkWidget     *label;
+  GtkWidget     *vbox;
+  GtkWidget     *vbox2;
+  GtkWidget     *hbox;
+  GtkWidget     *table;
+  GtkWidget     *toggle;
+  GtkWidget     *push_col1 = NULL;
+  GtkWidget     *push_col2 = NULL;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/smooth-palette.c b/plug-ins/common/smooth-palette.c
index ed49a64..e72cee7 100644
--- a/plug-ins/common/smooth-palette.c
+++ b/plug-ins/common/smooth-palette.c
@@ -397,14 +397,14 @@ smooth_palette (GimpDrawable *drawable,
 static gboolean
 dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dlg;
-  GtkWidget *spinbutton;
-  GtkObject *adj;
-  GtkWidget *sizeentry;
-  guint32    image_id;
-  GimpUnit   unit;
-  gdouble    xres, yres;
-  gboolean   run;
+  GtkWidget     *dlg;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  GtkWidget     *sizeentry;
+  guint32        image_id;
+  GimpUnit       unit;
+  gdouble        xres, yres;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/softglow.c b/plug-ins/common/softglow.c
index 9707d78..2814da9 100644
--- a/plug-ins/common/softglow.c
+++ b/plug-ins/common/softglow.c
@@ -619,12 +619,12 @@ find_constants (gdouble n_p[],
 static gboolean
 softglow_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *table;
-  GtkObject *scale_data;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkAdjustment *scale_data;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c
index 641a524..73d2eea 100644
--- a/plug-ins/common/sparkle.c
+++ b/plug-ins/common/sparkle.c
@@ -320,16 +320,16 @@ run (const gchar      *name,
 static gboolean
 sparkle_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *table;
-  GtkWidget *toggle;
-  GtkWidget *r1, *r2, *r3;
-  GtkObject *scale_data;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *table;
+  GtkWidget     *toggle;
+  GtkWidget     *r1, *r2, *r3;
+  GtkAdjustment *scale_data;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/sphere-designer.c b/plug-ins/common/sphere-designer.c
index 967f625..6995ceb 100644
--- a/plug-ins/common/sphere-designer.c
+++ b/plug-ins/common/sphere-designer.c
@@ -326,15 +326,15 @@ static gdouble   turbulence    (gdouble              *point,
 
 static GtkTreeView *texturelist = NULL;
 
-static GtkObject *scalexscale, *scaleyscale, *scalezscale;
-static GtkObject *rotxscale, *rotyscale, *rotzscale;
-static GtkObject *posxscale, *posyscale, *poszscale;
-static GtkObject *scalescale;
-static GtkObject *turbulencescale;
-static GtkObject *amountscale;
-static GtkObject *expscale;
-static GtkWidget *typemenu;
-static GtkWidget *texturemenu;
+static GtkAdjustment *scalexscale, *scaleyscale, *scalezscale;
+static GtkAdjustment *rotxscale, *rotyscale, *rotzscale;
+static GtkAdjustment *posxscale, *posyscale, *poszscale;
+static GtkAdjustment *scalescale;
+static GtkAdjustment *turbulencescale;
+static GtkAdjustment *amountscale;
+static GtkAdjustment *expscale;
+static GtkWidget     *typemenu;
+static GtkWidget     *texturemenu;
 
 #define DOT(a,b) (a[0] * b[0] + a[1] * b[1] + a[2] * b[2])
 
@@ -1817,25 +1817,24 @@ setvals (texture *t)
     return;
 
   noupdate = TRUE;
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (amountscale), t->amount);
+  gtk_adjustment_set_value (amountscale, t->amount);
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (scalescale), t->oscale);
+  gtk_adjustment_set_value (scalescale, t->oscale);
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (scalexscale), t->scale.x);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (scaleyscale), t->scale.y);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (scalezscale), t->scale.z);
+  gtk_adjustment_set_value (scalexscale, t->scale.x);
+  gtk_adjustment_set_value (scaleyscale, t->scale.y);
+  gtk_adjustment_set_value (scalezscale, t->scale.z);
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (rotxscale), t->rotate.x);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (rotyscale), t->rotate.y);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (rotzscale), t->rotate.z);
+  gtk_adjustment_set_value (rotxscale, t->rotate.x);
+  gtk_adjustment_set_value (rotyscale, t->rotate.y);
+  gtk_adjustment_set_value (rotzscale, t->rotate.z);
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (posxscale), t->translate.x);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (posyscale), t->translate.y);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (poszscale), t->translate.z);
+  gtk_adjustment_set_value (posxscale, t->translate.x);
+  gtk_adjustment_set_value (posyscale, t->translate.y);
+  gtk_adjustment_set_value (poszscale, t->translate.z);
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (turbulencescale),
-                            t->turbulence.x);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (expscale), t->exp);
+  gtk_adjustment_set_value (turbulencescale, t->turbulence.x);
+  gtk_adjustment_set_value (expscale, t->exp);
 
   drawcolor1 (NULL);
   drawcolor2 (NULL);
@@ -2372,25 +2371,25 @@ getscales (GtkWidget *widget,
   if (!t)
     return;
 
-  t->amount = gtk_adjustment_get_value (GTK_ADJUSTMENT (amountscale));
-  t->exp = gtk_adjustment_get_value (GTK_ADJUSTMENT (expscale));
+  t->amount = gtk_adjustment_get_value (amountscale);
+  t->exp = gtk_adjustment_get_value (expscale);
 
-  f = gtk_adjustment_get_value (GTK_ADJUSTMENT (turbulencescale));
+  f = gtk_adjustment_get_value (turbulencescale);
   vset (&t->turbulence, f, f, f);
 
-  t->oscale = gtk_adjustment_get_value (GTK_ADJUSTMENT (scalescale));
+  t->oscale = gtk_adjustment_get_value (scalescale);
 
-  t->scale.x = gtk_adjustment_get_value (GTK_ADJUSTMENT (scalexscale));
-  t->scale.y = gtk_adjustment_get_value (GTK_ADJUSTMENT (scaleyscale));
-  t->scale.z = gtk_adjustment_get_value (GTK_ADJUSTMENT (scalezscale));
+  t->scale.x = gtk_adjustment_get_value (scalexscale);
+  t->scale.y = gtk_adjustment_get_value (scaleyscale);
+  t->scale.z = gtk_adjustment_get_value (scalezscale);
 
-  t->rotate.x = gtk_adjustment_get_value (GTK_ADJUSTMENT (rotxscale));
-  t->rotate.y = gtk_adjustment_get_value (GTK_ADJUSTMENT (rotyscale));
-  t->rotate.z = gtk_adjustment_get_value (GTK_ADJUSTMENT (rotzscale));
+  t->rotate.x = gtk_adjustment_get_value (rotxscale);
+  t->rotate.y = gtk_adjustment_get_value (rotyscale);
+  t->rotate.z = gtk_adjustment_get_value (rotzscale);
 
-  t->translate.x = gtk_adjustment_get_value (GTK_ADJUSTMENT (posxscale));
-  t->translate.y = gtk_adjustment_get_value (GTK_ADJUSTMENT (posyscale));
-  t->translate.z = gtk_adjustment_get_value (GTK_ADJUSTMENT (poszscale));
+  t->translate.x = gtk_adjustment_get_value (posxscale);
+  t->translate.y = gtk_adjustment_get_value (posyscale);
+  t->translate.z = gtk_adjustment_get_value (poszscale);
 
   restartrender ();
 }
diff --git a/plug-ins/common/threshold-alpha.c b/plug-ins/common/threshold-alpha.c
index 0e15ddf..065a840 100644
--- a/plug-ins/common/threshold-alpha.c
+++ b/plug-ins/common/threshold-alpha.c
@@ -235,12 +235,12 @@ threshold_alpha (GimpDrawable *drawable,
 static gboolean
 threshold_alpha_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *table;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/tile-glass.c b/plug-ins/common/tile-glass.c
index b4281f9..df0829a 100644
--- a/plug-ins/common/tile-glass.c
+++ b/plug-ins/common/tile-glass.c
@@ -62,9 +62,9 @@ typedef struct
 
 typedef struct
 {
-  GlassValues *gval;
-  GtkObject   *xadj;
-  GtkObject   *yadj;
+  GlassValues   *gval;
+  GtkAdjustment *xadj;
+  GtkAdjustment *yadj;
 } GlassChainedValues;
 
 /* --- Declare local functions --- */
@@ -77,7 +77,7 @@ static void      run                     (const gchar      *name,
 
 static gboolean  glasstile_dialog        (GimpDrawable     *drawable);
 
-static void      glasstile_size_changed  (GtkObject        *adj,
+static void      glasstile_size_changed  (GtkAdjustment    *adj,
                                           gpointer          data);
 static void      glasstile_chain_toggled (GtkWidget        *widget,
                                           gboolean         *value);
@@ -331,24 +331,22 @@ glasstile_dialog (GimpDrawable *drawable)
 }
 
 static void
-glasstile_size_changed (GtkObject *adj,
-                        gpointer   data)
+glasstile_size_changed (GtkAdjustment *adj,
+                        gpointer       data)
 {
   GlassChainedValues *gv = data;
 
   if (adj == gv->xadj)
     {
-      gimp_int_adjustment_update(GTK_ADJUSTMENT (gv->xadj), &gv->gval->xblock);
+      gimp_int_adjustment_update (gv->xadj, &gv->gval->xblock);
       if (gv->gval->constrain)
-        gtk_adjustment_set_value(GTK_ADJUSTMENT (gv->yadj),
-                                 (gdouble) gv->gval->xblock);
+        gtk_adjustment_set_value (gv->yadj, gv->gval->xblock);
     }
   else if (adj == gv->yadj)
     {
-      gimp_int_adjustment_update(GTK_ADJUSTMENT (gv->yadj), &gv->gval->yblock);
+      gimp_int_adjustment_update (gv->yadj, &gv->gval->yblock);
       if (gv->gval->constrain)
-        gtk_adjustment_set_value(GTK_ADJUSTMENT (gv->xadj),
-                                 (gdouble) gv->gval->yblock);
+        gtk_adjustment_set_value (gv->xadj, gv->gval->yblock);
     }
 }
 
diff --git a/plug-ins/common/tile-paper.c b/plug-ins/common/tile-paper.c
index 921c479..bc2499e 100644
--- a/plug-ins/common/tile-paper.c
+++ b/plug-ins/common/tile-paper.c
@@ -171,10 +171,10 @@ params_load_from_gimp (void)
 
 static struct
 {
-  GtkObject *tile_width_adj;
-  GtkObject *tile_height_adj;
-  GtkObject *division_x_adj;
-  GtkObject *division_y_adj;
+  GtkAdjustment *tile_width_adj;
+  GtkAdjustment *tile_height_adj;
+  GtkAdjustment *division_x_adj;
+  GtkAdjustment *division_y_adj;
 } w;
 
 static void
@@ -184,8 +184,7 @@ tile_width_adj_changed (GtkAdjustment *adj)
     {
       p.params.tile_width  = gtk_adjustment_get_value (adj);
       p.params.division_x = p.drawable->width  / p.params.tile_width;
-      gtk_adjustment_set_value (GTK_ADJUSTMENT (w.division_x_adj),
-                                p.params.division_x);
+      gtk_adjustment_set_value (w.division_x_adj, p.params.division_x);
     }
 }
 
@@ -196,8 +195,7 @@ tile_height_adj_changed (GtkAdjustment *adj)
     {
       p.params.tile_height  = gtk_adjustment_get_value (adj);
       p.params.division_y = p.drawable->height / p.params.tile_height;
-      gtk_adjustment_set_value (GTK_ADJUSTMENT (w.division_y_adj),
-                                p.params.division_y);
+      gtk_adjustment_set_value (w.division_y_adj, p.params.division_y);
     }
 }
 
@@ -208,8 +206,7 @@ division_x_adj_changed (GtkAdjustment *adj)
     {
       p.params.division_x = gtk_adjustment_get_value (adj);
       p.params.tile_width  = p.drawable->width  / p.params.division_x;
-      gtk_adjustment_set_value (GTK_ADJUSTMENT (w.tile_width_adj),
-                                p.params.tile_width);
+      gtk_adjustment_set_value (w.tile_width_adj, p.params.tile_width);
     }
 }
 
@@ -220,22 +217,21 @@ division_y_adj_changed (GtkAdjustment *adj)
     {
       p.params.division_y = gtk_adjustment_get_value (adj);
       p.params.tile_height  = p.drawable->height / p.params.division_y;
-      gtk_adjustment_set_value (GTK_ADJUSTMENT (w.tile_height_adj),
-                                p.params.tile_height);
+      gtk_adjustment_set_value (w.tile_height_adj, p.params.tile_height);
     }
 }
 
 static void
 open_dialog (void)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_hbox;
-  GtkWidget *button;
-  GtkObject *adjustment;
-  GtkWidget *vbox;
-  GtkWidget *table;
-  GtkWidget *frame;
-  GtkWidget *color_button;
+  GtkWidget     *dialog;
+  GtkWidget     *main_hbox;
+  GtkWidget     *button;
+  GtkAdjustment *adjustment;
+  GtkWidget     *vbox;
+  GtkWidget     *table;
+  GtkWidget     *frame;
+  GtkWidget     *color_button;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/tile-small.c b/plug-ins/common/tile-small.c
index 608cb71..614bdc6 100644
--- a/plug-ins/common/tile-small.c
+++ b/plug-ins/common/tile-small.c
@@ -155,11 +155,11 @@ typedef struct
 {
   AppliedTo  type;
 
-  gint       x;        /* X - pos of tile   */
-  gint       y;        /* Y - pos of tile   */
-  GtkObject *r_adj;    /* row adjustment    */
-  GtkObject *c_adj;    /* column adjustment */
-  GtkWidget *applybut; /* The apply button  */
+  gint           x;        /* X - pos of tile   */
+  gint           y;        /* Y - pos of tile   */
+  GtkAdjustment *r_adj;    /* row adjustment    */
+  GtkAdjustment *c_adj;    /* column adjustment */
+  GtkWidget     *applybut; /* The apply button  */
 } Exp_Call;
 
 static Exp_Call exp_call =
@@ -347,21 +347,21 @@ run (const gchar      *name,
 static gboolean
 tileit_dialog (void)
 {
-  GtkWidget *dlg;
-  GtkWidget *main_vbox;
-  GtkWidget *hbox;
-  GtkWidget *vbox;
-  GtkWidget *frame;
-  GtkWidget *table;
-  GtkWidget *table2;
-  GtkWidget *button;
-  GtkWidget *label;
-  GtkWidget *spinbutton;
-  GtkObject *adj;
-  GtkObject *scale;
-  GtkWidget *toggle;
-  GSList    *orientation_group = NULL;
-  gboolean   run;
+  GtkWidget     *dlg;
+  GtkWidget     *main_vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *vbox;
+  GtkWidget     *frame;
+  GtkWidget     *table;
+  GtkWidget     *table2;
+  GtkWidget     *button;
+  GtkWidget     *label;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  GtkAdjustment *scale;
+  GtkWidget     *toggle;
+  GSList        *orientation_group = NULL;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/unit-editor.c b/plug-ins/common/unit-editor.c
index ef10d0f..1c5754a 100644
--- a/plug-ins/common/unit-editor.c
+++ b/plug-ins/common/unit-editor.c
@@ -189,20 +189,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_BINARY,
                             main_dialog, GTK_DIALOG_MODAL,
@@ -323,8 +323,8 @@ new_unit_dialog (GtkWidget *main_dialog,
         break;
 
       identifier   = g_strdup (gtk_entry_get_text (GTK_ENTRY (identifier_entry)));
-      factor       = gtk_adjustment_get_value (GTK_ADJUSTMENT (factor_adj));
-      digits       = gtk_adjustment_get_value (GTK_ADJUSTMENT (digits_adj));
+      factor       = gtk_adjustment_get_value (factor_adj);
+      digits       = gtk_adjustment_get_value (digits_adj);
       symbol       = g_strdup (gtk_entry_get_text (GTK_ENTRY (symbol_entry)));
       abbreviation = g_strdup (gtk_entry_get_text (GTK_ENTRY (abbreviation_entry)));
       singular     = g_strdup (gtk_entry_get_text (GTK_ENTRY (singular_entry)));
diff --git a/plug-ins/common/unsharp-mask.c b/plug-ins/common/unsharp-mask.c
index e9659e6..88a5793 100644
--- a/plug-ins/common/unsharp-mask.c
+++ b/plug-ins/common/unsharp-mask.c
@@ -817,12 +817,12 @@ gen_convolve_matrix (gdouble   radius,
 static gboolean
 unsharp_mask_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *table;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/value-propagate.c b/plug-ins/common/value-propagate.c
index 6352066..16414ec 100644
--- a/plug-ins/common/value-propagate.c
+++ b/plug-ins/common/value-propagate.c
@@ -1071,17 +1071,17 @@ propagate_transparent (GimpImageType  image_type,
 static gboolean
 vpropagate_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *hbox;
-  GtkWidget *frame;
-  GtkWidget *table;
-  GtkWidget *toggle_vbox;
-  GtkWidget *button;
-  GtkObject *adj;
-  GSList    *group = NULL;
-  gint       index = 0;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *frame;
+  GtkWidget     *table;
+  GtkWidget     *toggle_vbox;
+  GtkWidget     *button;
+  GtkAdjustment *adj;
+  GSList        *group = NULL;
+  gint           index = 0;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/van-gogh-lic.c b/plug-ins/common/van-gogh-lic.c
index c269e26..2545fc3 100644
--- a/plug-ins/common/van-gogh-lic.c
+++ b/plug-ins/common/van-gogh-lic.c
@@ -628,14 +628,14 @@ effect_image_constrain (gint32    image_id,
 static gboolean
 create_main_dialog (void)
 {
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *frame;
-  GtkWidget *table;
-  GtkWidget *combo;
-  GtkObject *scale_data;
-  gint       row;
-  gboolean   run;
+  GtkWidget     *vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *frame;
+  GtkWidget     *table;
+  GtkWidget     *combo;
+  GtkAdjustment *scale_data;
+  gint           row;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c
index 0cec6b5..2724857 100644
--- a/plug-ins/common/warp.c
+++ b/plug-ins/common/warp.c
@@ -355,20 +355,20 @@ run (const gchar      *name,
 static gboolean
 warp_dialog (GimpDrawable *drawable)
 {
-  GtkWidget    *dlg;
-  GtkWidget    *vbox;
-  GtkWidget    *label;
-  GtkWidget    *toggle;
-  GtkWidget    *toggle_hbox;
-  GtkWidget    *frame;
-  GtkWidget    *table;
-  GtkWidget    *spinbutton;
-  GtkObject    *adj;
-  GtkWidget    *combo;
-  GtkSizeGroup *label_group;
-  GtkSizeGroup *spin_group;
-  GSList       *group = NULL;
-  gboolean      run;
+  GtkWidget     *dlg;
+  GtkWidget     *vbox;
+  GtkWidget     *label;
+  GtkWidget     *toggle;
+  GtkWidget     *toggle_hbox;
+  GtkWidget     *frame;
+  GtkWidget     *table;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  GtkWidget     *combo;
+  GtkSizeGroup  *label_group;
+  GtkSizeGroup  *spin_group;
+  GSList        *group = NULL;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, FALSE);
 
diff --git a/plug-ins/common/waves.c b/plug-ins/common/waves.c
index e6d464e..9ffd922 100644
--- a/plug-ins/common/waves.c
+++ b/plug-ins/common/waves.c
@@ -232,16 +232,16 @@ waves (GimpDrawable *drawable)
 static gboolean
 waves_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *frame;
-  GtkWidget *smear;
-  GtkWidget *blacken;
-  GtkWidget *table;
-  GtkWidget *preview;
-  GtkWidget *toggle;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *frame;
+  GtkWidget     *smear;
+  GtkWidget     *blacken;
+  GtkWidget     *table;
+  GtkWidget     *preview;
+  GtkWidget     *toggle;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/whirl-pinch.c b/plug-ins/common/whirl-pinch.c
index 93d2b35..3960efd 100644
--- a/plug-ins/common/whirl-pinch.c
+++ b/plug-ins/common/whirl-pinch.c
@@ -515,12 +515,12 @@ calc_undistorted_coords (gdouble  wx,
 static gboolean
 whirl_pinch_dialog (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *table;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/common/wind.c b/plug-ins/common/wind.c
index d976f05..bda1c3c 100644
--- a/plug-ins/common/wind.c
+++ b/plug-ins/common/wind.c
@@ -858,20 +858,20 @@ reverse_buffer (guchar *buffer,
 static gint
 dialog_box (GimpDrawable *drawable)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *table;
-  GtkWidget *preview;
-  GtkObject *adj;
-  GtkWidget *frame;
-  GtkWidget *style1;
-  GtkWidget *style2;
-  GtkWidget *dir1;
-  GtkWidget *dir2;
-  GtkWidget *edge1;
-  GtkWidget *edge2;
-  GtkWidget *edge3;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *table;
+  GtkWidget     *preview;
+  GtkAdjustment *adj;
+  GtkWidget     *frame;
+  GtkWidget     *style1;
+  GtkWidget     *style2;
+  GtkWidget     *dir1;
+  GtkWidget     *dir2;
+  GtkWidget     *edge1;
+  GtkWidget     *edge2;
+  GtkWidget     *edge3;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 



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