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



commit 1ddb16d2b03a867bbf1ead431023dfd051472d4d
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/align-layers.c    |   12 +++---
 plug-ins/common/curve-bend.c      |   32 ++++++++--------
 plug-ins/common/file-gih.c        |   27 ++++++--------
 plug-ins/common/file-raw-data.c   |   22 ++++++------
 plug-ins/common/file-xmc.c        |   35 ++++++++----------
 plug-ins/common/file-xpm.c        |    8 ++--
 plug-ins/common/film.c            |   50 +++++++++++++-------------
 plug-ins/common/filter-pack.c     |   15 +++-----
 plug-ins/common/fractal-trace.c   |   16 ++++----
 plug-ins/common/illusion.c        |   18 +++++-----
 plug-ins/common/jigsaw.c          |   20 +++++-----
 plug-ins/common/newsprint.c       |   72 ++++++++++++++++++------------------
 plug-ins/common/nl-filter.c       |   20 +++++-----
 plug-ins/common/oilify.c          |   18 +++++-----
 plug-ins/common/photocopy.c       |   12 +++---
 plug-ins/common/ripple.c          |   32 ++++++++--------
 plug-ins/common/sample-colorize.c |   22 ++++++------
 plug-ins/common/sharpen.c         |   12 +++---
 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/tile-paper.c      |   36 ++++++++----------
 plug-ins/common/tile-small.c      |   40 ++++++++++----------
 plug-ins/common/unit-editor.c     |    4 +-
 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/web-page.c        |    5 +--
 plug-ins/common/wind.c            |   28 +++++++-------
 31 files changed, 368 insertions(+), 385 deletions(-)
---
diff --git a/plug-ins/common/align-layers.c b/plug-ins/common/align-layers.c
index 133c139..5658242 100644
--- a/plug-ins/common/align-layers.c
+++ b/plug-ins/common/align-layers.c
@@ -614,12 +614,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 2299113..f43d909 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 08aac10..973a8fd 100644
--- a/plug-ins/common/file-gih.c
+++ b/plug-ins/common/file-gih.c
@@ -836,10 +836,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));
 }
 
@@ -929,8 +929,7 @@ gih_save_dialog (gint32 image_ID)
   /*
    * Spacing: __
    */
-  adjustment = (GtkAdjustment *) gtk_adjustment_new (info.spacing,
-                                                     1, 1000, 1, 10, 0);
+  adjustment = 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, 1,
@@ -946,9 +945,8 @@ gih_save_dialog (gint32 image_ID)
    */
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
 
-  adjustment = (GtkAdjustment *)
-    gtk_adjustment_new (gihparams.cellwidth,
-                        2, gimp_image_width (image_ID), 1, 10, 0);
+  adjustment = 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);
@@ -970,9 +968,8 @@ gih_save_dialog (gint32 image_ID)
   gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
 
-  adjustment = (GtkAdjustment *)
-    gtk_adjustment_new (gihparams.cellheight,
-                        2, gimp_image_height (image_ID), 1, 10, 0);
+  adjustment = 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);
@@ -1002,8 +999,7 @@ gih_save_dialog (gint32 image_ID)
   /*
    * Number of cells: ___
    */
-  adjustment = (GtkAdjustment *)
-    gtk_adjustment_new (gihparams.ncells, 1, 1000, 1, 10, 0);
+  adjustment = 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,
@@ -1063,8 +1059,8 @@ gih_save_dialog (gint32 image_ID)
   /*
    * Dimension: ___
    */
-  adjustment = (GtkAdjustment *)
-    gtk_adjustment_new (gihparams.dim, 1, GIMP_PIXPIPE_MAXDIM, 1, 1, 0);
+  adjustment = 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,
@@ -1085,8 +1081,7 @@ gih_save_dialog (gint32 image_ID)
     {
       gint j;
 
-      adjustment = (GtkAdjustment *)
-        gtk_adjustment_new (gihparams.rank[i], 1, 100, 1, 1, 0);
+      adjustment = 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,
diff --git a/plug-ins/common/file-raw-data.c b/plug-ins/common/file-raw-data.c
index 0b1732c..26afc78 100644
--- a/plug-ins/common/file-raw-data.c
+++ b/plug-ins/common/file-raw-data.c
@@ -1352,17 +1352,17 @@ palette_update (GimpPreviewArea *preview)
 static gboolean
 load_dialog (const gchar *filename)
 {
-  GtkWidget *dialog;
-  GtkWidget *main_vbox;
-  GtkWidget *preview;
-  GtkWidget *sw;
-  GtkWidget *frame;
-  GtkWidget *table;
-  GtkWidget *combo;
-  GtkWidget *button;
-  GtkObject *adj;
-  gint32     file_size;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *preview;
+  GtkWidget     *table;
+  GtkWidget     *sw;
+  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-xmc.c b/plug-ins/common/file-xmc.c
index caf5812..1b2b5a1 100644
--- a/plug-ins/common/file-xmc.c
+++ b/plug-ins/common/file-xmc.c
@@ -1014,18 +1014,18 @@ static gboolean
 save_dialog (const gint32     image_ID,
              GimpParamRegion *hotspotRange)
 {
-  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;
+  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"),
@@ -1054,8 +1054,7 @@ save_dialog (const gint32     image_ID,
   x1 = hotspotRange->x;
   x2 = hotspotRange->width + hotspotRange->x - 1;
 
-  adjustment = (GtkAdjustment *)
-    gtk_adjustment_new (xmcparas.x, x1, x2, 1, 5, 0);
+  adjustment = 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);
@@ -1077,8 +1076,7 @@ save_dialog (const gint32     image_ID,
   y1 = hotspotRange->y;
   y2 = hotspotRange->height + hotspotRange->y - 1;
 
-  adjustment = (GtkAdjustment *)
-    gtk_adjustment_new (xmcparas.y, y1, y2, 1, 5, 0);
+  adjustment = 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);
@@ -1182,9 +1180,8 @@ save_dialog (const gint32     image_ID,
                              "each frame is rendered."),
                            NULL);
 
-  adjustment = (GtkAdjustment *)
-    gtk_adjustment_new (xmcvals.delay, CURSOR_MINIMUM_DELAY,
-                        CURSOR_MAX_DELAY, 1, 5, 0);
+  adjustment = 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);
diff --git a/plug-ins/common/file-xpm.c b/plug-ins/common/file-xpm.c
index a187406..26407ce 100644
--- a/plug-ins/common/file-xpm.c
+++ b/plug-ins/common/file-xpm.c
@@ -821,10 +821,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 e1ec793..01f6ba3 100644
--- a/plug-ins/common/film.c
+++ b/plug-ins/common/film.c
@@ -67,9 +67,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_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
@@ -1120,13 +1120,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);
@@ -1319,7 +1319,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 5c060d4..4bab00f 100644
--- a/plug-ins/common/filter-pack.c
+++ b/plug-ins/common/filter-pack.c
@@ -633,8 +633,7 @@ fp_create_rough (void)
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
-  data = (GtkAdjustment *)
-    gtk_adjustment_new (fpvals.roughness, 0, 1.0, 0.05, 0.01, 0.0);
+  data = gtk_adjustment_new (fpvals.roughness, 0, 1.0, 0.05, 0.01, 0.0);
   fp_widgets.roughness_scale = scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL,
                                                       data);
 
@@ -1397,9 +1396,8 @@ fp_advanced_dialog (GtkWidget *parent)
                         GTK_EXPAND | GTK_FILL, 0, 0, 0);
     }
 
-  smoothnessData = (GtkAdjustment *)
-    gtk_adjustment_new (fpvals.aliasing,
-                        0, 1.0, 0.05, 0.01, 0.0);
+  smoothnessData = gtk_adjustment_new (fpvals.aliasing,
+                                       0, 1.0, 0.05, 0.01, 0.0);
 
   fp_widgets.aliasing_scale = scale =
     gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, smoothnessData);
@@ -1423,10 +1421,9 @@ fp_advanced_dialog (GtkWidget *parent)
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
-  smoothnessData = (GtkAdjustment *)
-    gtk_adjustment_new (fpvals.preview_size,
-                        50, MAX_PREVIEW_SIZE,
-                        5, 5, 0.0);
+  smoothnessData = gtk_adjustment_new (fpvals.preview_size,
+                                       50, MAX_PREVIEW_SIZE,
+                                       5, 5, 0.0);
 
   fp_widgets.preview_size_scale = scale =
     gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, smoothnessData);
diff --git a/plug-ins/common/fractal-trace.c b/plug-ins/common/fractal-trace.c
index 47331e3..e47378d 100644
--- a/plug-ins/common/fractal-trace.c
+++ b/plug-ins/common/fractal-trace.c
@@ -677,14 +677,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 99d4dd1..0889e64 100644
--- a/plug-ins/common/illusion.c
+++ b/plug-ins/common/illusion.c
@@ -335,15 +335,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/jigsaw.c b/plug-ins/common/jigsaw.c
index 8cf8249..29efb39 100644
--- a/plug-ins/common/jigsaw.c
+++ b/plug-ins/common/jigsaw.c
@@ -2377,16 +2377,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/newsprint.c b/plug-ins/common/newsprint.c
index e9b21c7..345ad66 100644
--- a/plug-ins/common/newsprint.c
+++ b/plug-ins/common/newsprint.c
@@ -228,15 +228,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 */
 };
 
 
@@ -244,18 +244,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 colorspace */
-  channel_st *chst[NUM_CS][4];
+  /* room for up to 4 channels per colourspace */
+  channel_st    *chst[NUM_CS][4];
 } NewsprintDialog_st;
 
 
@@ -843,7 +843,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;
         }
 
@@ -863,7 +863,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,
@@ -883,7 +883,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,
@@ -903,7 +903,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,
@@ -940,7 +940,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
@@ -1138,19 +1138,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 8121dbb..9e0e1b9 100644
--- a/plug-ins/common/nl-filter.c
+++ b/plug-ins/common/nl-filter.c
@@ -1000,16 +1000,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/oilify.c b/plug-ins/common/oilify.c
index beb77e2..e2c985b 100644
--- a/plug-ins/common/oilify.c
+++ b/plug-ins/common/oilify.c
@@ -758,15 +758,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 dae8eb0..adc7fb7 100644
--- a/plug-ins/common/photocopy.c
+++ b/plug-ins/common/photocopy.c
@@ -828,12 +828,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/ripple.c b/plug-ins/common/ripple.c
index 4dd72df..4f8e6b4 100644
--- a/plug-ins/common/ripple.c
+++ b/plug-ins/common/ripple.c
@@ -461,22 +461,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 f4310a1..7ccbd87 100644
--- a/plug-ins/common/sample-colorize.c
+++ b/plug-ins/common/sample-colorize.c
@@ -1293,17 +1293,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/sharpen.c b/plug-ins/common/sharpen.c
index 589a851..33f9ebe 100644
--- a/plug-ins/common/sharpen.c
+++ b/plug-ins/common/sharpen.c
@@ -459,12 +459,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/smooth-palette.c b/plug-ins/common/smooth-palette.c
index f3bf5fb..4f15329 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 57ca563..332795b 100644
--- a/plug-ins/common/softglow.c
+++ b/plug-ins/common/softglow.c
@@ -621,12 +621,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 fc26bd1..781a7d6 100644
--- a/plug-ins/common/sparkle.c
+++ b/plug-ins/common/sparkle.c
@@ -321,16 +321,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 b1ea411..7949754 100644
--- a/plug-ins/common/sphere-designer.c
+++ b/plug-ins/common/sphere-designer.c
@@ -327,15 +327,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])
 
@@ -1823,25 +1823,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);
@@ -2378,25 +2377,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/tile-paper.c b/plug-ins/common/tile-paper.c
index d6b9496..1d7fdb7 100644
--- a/plug-ins/common/tile-paper.c
+++ b/plug-ins/common/tile-paper.c
@@ -172,10 +172,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
@@ -185,8 +185,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);
     }
 }
 
@@ -197,8 +196,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);
     }
 }
 
@@ -209,8 +207,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);
     }
 }
 
@@ -221,22 +218,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 4973fd8..529ea9d 100644
--- a/plug-ins/common/tile-small.c
+++ b/plug-ins/common/tile-small.c
@@ -156,11 +156,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 =
@@ -346,21 +346,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 b387695..6efc8e7 100644
--- a/plug-ins/common/unit-editor.c
+++ b/plug-ins/common/unit-editor.c
@@ -325,8 +325,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 252b083..34af264 100644
--- a/plug-ins/common/unsharp-mask.c
+++ b/plug-ins/common/unsharp-mask.c
@@ -822,12 +822,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 71b421e..c15f0a0 100644
--- a/plug-ins/common/value-propagate.c
+++ b/plug-ins/common/value-propagate.c
@@ -1069,17 +1069,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 c2f6cd7..7efeb18 100644
--- a/plug-ins/common/van-gogh-lic.c
+++ b/plug-ins/common/van-gogh-lic.c
@@ -630,14 +630,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 b1eb57a..f8d1969 100644
--- a/plug-ins/common/warp.c
+++ b/plug-ins/common/warp.c
@@ -354,20 +354,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/web-page.c b/plug-ins/common/web-page.c
index 6e069a4..49c2cd8 100644
--- a/plug-ins/common/web-page.c
+++ b/plug-ins/common/web-page.c
@@ -290,9 +290,8 @@ webpage_dialog (void)
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
 
-  adjustment = (GtkAdjustment *)
-    gtk_adjustment_new (webpagevals.width,
-                        1, 8192, 1, 10, 0);
+  adjustment = 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);
diff --git a/plug-ins/common/wind.c b/plug-ins/common/wind.c
index 8db1046..875c1c8 100644
--- a/plug-ins/common/wind.c
+++ b/plug-ins/common/wind.c
@@ -856,20 +856,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]