[gimp/gtk3-port: 82/227] plug-ins: more s/GtkObject/GtkAdjustment/

[Clayton Walker <claytonw src gnome org>]

commit 733b8ece7f879d537916fd69f6c324dac95c060d
Author: Michael Natterer <mitch gimp org>
Date:   Mon Oct 25 01:35:35 2010 +0200

    plug-ins: more s/GtkObject/GtkAdjustment/

 plug-ins/common/file-pdf-load.c                    |    7 +-
 plug-ins/file-fli/fli-gimp.c                       |   24 +++---
 plug-ins/flame/flame.c                             |   40 ++++----
 .../fractal-explorer/fractal-explorer-dialogs.c    |   22 +++---
 plug-ins/fractal-explorer/fractal-explorer.h       |   40 ++++----
 plug-ins/gradient-flare/gradient-flare.c           |   92 ++++++++++----------
 6 files changed, 112 insertions(+), 113 deletions(-)
---
diff --git a/plug-ins/common/file-pdf-load.c b/plug-ins/common/file-pdf-load.c
index a57426a..05248a2 100644
--- a/plug-ins/common/file-pdf-load.c
+++ b/plug-ins/common/file-pdf-load.c
@@ -132,7 +132,7 @@ struct _GimpResolutionEntryField
 
   guint          changed_signal;
 
-  GtkObject     *adjustment;
+  GtkAdjustment *adjustment;
   GtkWidget     *spinbutton;
 
   gdouble        phy_size;
@@ -1643,7 +1643,7 @@ gimp_resolution_entry_update_value (GimpResolutionEntryField *gref,
                                           factor);
     }
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (gref->adjustment), value);
+  gtk_adjustment_set_value (gref->adjustment, value);
 
   gref->stop_recursion--;
 
@@ -1686,8 +1686,7 @@ gimp_resolution_entry_update_unit (GimpResolutionEntry *gre,
   gre->x.max_value *= factor;
   gre->x.value     *= factor;
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (gre->x.adjustment),
-                            gre->x.value);
+  gtk_adjustment_set_value (gre->x.adjustment, gre->x.value);
 
   gimp_resolution_entry_format_label (gre,
                                       gre->width.label, gre->width.phy_size);
diff --git a/plug-ins/file-fli/fli-gimp.c b/plug-ins/file-fli/fli-gimp.c
index 41c1027..9d1603f 100644
--- a/plug-ins/file-fli/fli-gimp.c
+++ b/plug-ins/file-fli/fli-gimp.c
@@ -845,12 +845,12 @@ save_image (const gchar  *filename,
 static gboolean
 load_dialog (const gchar *filename)
 {
-  GtkWidget *dialog;
-  GtkWidget *table;
-  GtkWidget *spinbutton;
-  GtkObject *adj;
-  gint32     width, height, nframes;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *table;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  gint32         width, height, nframes;
+  gboolean       run;
 
   get_info (filename, &width, &height, &nframes, NULL);
 
@@ -915,12 +915,12 @@ load_dialog (const gchar *filename)
 static gboolean
 save_dialog (gint32 image_id)
 {
-  GtkWidget *dialog;
-  GtkWidget *table;
-  GtkWidget *spinbutton;
-  GtkObject *adj;
-  gint       nframes;
-  gboolean   run;
+  GtkWidget     *dialog;
+  GtkWidget     *table;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adj;
+  gint           nframes;
+  gboolean       run;
 
   g_free (gimp_image_get_layers (image_id, &nframes));
 
diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c
index 80054dd..c2167ad 100644
--- a/plug-ins/flame/flame.c
+++ b/plug-ins/flame/flame.c
@@ -631,16 +631,16 @@ edit_callback (GtkWidget *widget,
 
   if (edit_dialog == NULL)
     {
-      GtkWidget *main_vbox;
-      GtkWidget *frame;
-      GtkWidget *table;
-      GtkWidget *vbox;
-      GtkWidget *hbox;
-      GtkWidget *button;
-      GtkWidget *combo;
-      GtkWidget *label;
-      GtkObject *adj;
-      gint       i, j;
+      GtkWidget     *main_vbox;
+      GtkWidget     *frame;
+      GtkWidget     *table;
+      GtkWidget     *vbox;
+      GtkWidget     *hbox;
+      GtkWidget     *button;
+      GtkWidget     *combo;
+      GtkWidget     *label;
+      GtkAdjustment *adj;
+      gint           i, j;
 
       edit_dialog = gimp_dialog_new (_("Edit Flame"), PLUG_IN_ROLE,
                                      parent, GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -951,16 +951,16 @@ cmap_constrain (gint32   image_id,
 static gboolean
 flame_dialog (void)
 {
-  GtkWidget *main_vbox;
-  GtkWidget *notebook;
-  GtkWidget *label;
-  GtkWidget *frame;
-  GtkWidget *abox;
-  GtkWidget *button;
-  GtkWidget *table;
-  GtkWidget *box;
-  GtkObject *adj;
-  gboolean   run;
+  GtkWidget     *main_vbox;
+  GtkWidget     *notebook;
+  GtkWidget     *label;
+  GtkWidget     *frame;
+  GtkWidget     *abox;
+  GtkWidget     *button;
+  GtkWidget     *table;
+  GtkWidget     *box;
+  GtkAdjustment *adj;
+  gboolean       run;
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
diff --git a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c 
b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
index 2a4a478..ee5402b 100644
--- a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
+++ b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
@@ -1444,17 +1444,17 @@ dialog_change_scale (void)
 {
   ready_now = FALSE;
 
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->xmin), wvals.xmin);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->xmax), wvals.xmax);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->ymin), wvals.ymin);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->ymax), wvals.ymax);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->iter), wvals.iter);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->cx),   wvals.cx);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->cy),   wvals.cy);
-
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->red),  wvals.redstretch);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->green),wvals.greenstretch);
-  gtk_adjustment_set_value (GTK_ADJUSTMENT (elements->blue), wvals.bluestretch);
+  gtk_adjustment_set_value (elements->xmin, wvals.xmin);
+  gtk_adjustment_set_value (elements->xmax, wvals.xmax);
+  gtk_adjustment_set_value (elements->ymin, wvals.ymin);
+  gtk_adjustment_set_value (elements->ymax, wvals.ymax);
+  gtk_adjustment_set_value (elements->iter, wvals.iter);
+  gtk_adjustment_set_value (elements->cx,   wvals.cx);
+  gtk_adjustment_set_value (elements->cy,   wvals.cy);
+
+  gtk_adjustment_set_value (elements->red,  wvals.redstretch);
+  gtk_adjustment_set_value (elements->green,wvals.greenstretch);
+  gtk_adjustment_set_value (elements->blue, wvals.bluestretch);
 
   gtk_toggle_button_set_active
     (GTK_TOGGLE_BUTTON (elements->type[wvals.fractaltype]), TRUE);
diff --git a/plug-ins/fractal-explorer/fractal-explorer.h b/plug-ins/fractal-explorer/fractal-explorer.h
index 2792e47..1d86698 100644
--- a/plug-ins/fractal-explorer/fractal-explorer.h
+++ b/plug-ins/fractal-explorer/fractal-explorer.h
@@ -100,32 +100,32 @@ typedef struct _DialogElements DialogElements;
 
 struct _DialogElements
 {
-  GtkWidget  *type[NUM_TYPES];
-  GtkObject  *xmin;
-  GtkObject  *xmax;
-  GtkObject  *ymin;
-  GtkObject  *ymax;
-  GtkObject  *iter;
-  GtkObject  *cx;
-  GtkObject  *cy;
+  GtkWidget     *type[NUM_TYPES];
+  GtkAdjustment *xmin;
+  GtkAdjustment *xmax;
+  GtkAdjustment *ymin;
+  GtkAdjustment *ymax;
+  GtkAdjustment *iter;
+  GtkAdjustment *cx;
+  GtkAdjustment *cy;
 
-  GtkObject  *ncol;
-  GtkWidget  *useloglog;
+  GtkAdjustment *ncol;
+  GtkWidget     *useloglog;
 
-  GtkObject  *red;
-  GtkObject  *green;
-  GtkObject  *blue;
+  GtkAdjustment *red;
+  GtkAdjustment *green;
+  GtkAdjustment *blue;
 
-  GtkWidget  *redmode[3];
-  GtkWidget  *redinvert;
+  GtkWidget     *redmode[3];
+  GtkWidget     *redinvert;
 
-  GtkWidget  *greenmode[3];
-  GtkWidget  *greeninvert;
+  GtkWidget     *greenmode[3];
+  GtkWidget     *greeninvert;
 
-  GtkWidget  *bluemode[3];
-  GtkWidget  *blueinvert;
+  GtkWidget     *bluemode[3];
+  GtkWidget     *blueinvert;
 
-  GtkWidget  *colormode[2];
+  GtkWidget     *colormode[2];
 };
 
 
diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c
index 94d8c46..0fa3d40 100644
--- a/plug-ins/gradient-flare/gradient-flare.c
+++ b/plug-ins/gradient-flare/gradient-flare.c
@@ -2695,16 +2695,16 @@ static void
 dlg_make_page_settings (GFlareDialog *dlg,
                         GtkWidget    *notebook)
 {
-  GtkWidget *main_vbox;
-  GtkWidget *frame;
-  GtkWidget *center;
-  GtkWidget *chain;
-  GtkWidget *table;
-  GtkWidget *button;
-  GtkWidget *asup_table;
-  GtkObject *adj;
-  gdouble    xres, yres;
-  gint       row;
+  GtkWidget     *main_vbox;
+  GtkWidget     *frame;
+  GtkWidget     *center;
+  GtkWidget     *chain;
+  GtkWidget     *table;
+  GtkWidget     *button;
+  GtkWidget     *asup_table;
+  GtkAdjustment *adj;
+  gdouble        xres, yres;
+  gint           row;
 
   main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
@@ -3432,12 +3432,12 @@ static void
 ed_make_page_general (GFlareEditor *ed,
                       GtkWidget    *notebook)
 {
-  GFlare    *gflare = ed->gflare;
-  GtkWidget *vbox;
-  GtkWidget *frame;
-  GtkWidget *table;
-  GtkWidget *combo;
-  GtkObject *adj;
+  GFlare        *gflare = ed->gflare;
+  GtkWidget     *vbox;
+  GtkWidget     *frame;
+  GtkWidget     *table;
+  GtkWidget     *combo;
+  GtkAdjustment *adj;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
@@ -3538,13 +3538,13 @@ static void
 ed_make_page_glow (GFlareEditor *ed,
                    GtkWidget    *notebook)
 {
-  GFlare       *gflare = ed->gflare;
-  GradientMenu *gm;
-  GtkWidget    *vbox;
-  GtkWidget    *frame;
-  GtkWidget    *table;
-  GtkObject    *adj;
-  gint          row;
+  GFlare        *gflare = ed->gflare;
+  GradientMenu  *gm;
+  GtkWidget     *vbox;
+  GtkWidget     *frame;
+  GtkWidget     *table;
+  GtkAdjustment *adj;
+  gint           row;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
@@ -3641,13 +3641,13 @@ static void
 ed_make_page_rays (GFlareEditor *ed,
                    GtkWidget    *notebook)
 {
-  GFlare       *gflare = ed->gflare;
-  GradientMenu *gm;
-  GtkWidget    *vbox;
-  GtkWidget    *frame;
-  GtkWidget    *table;
-  GtkObject    *adj;
-  gint          row;
+  GFlare        *gflare = ed->gflare;
+  GradientMenu  *gm;
+  GtkWidget     *vbox;
+  GtkWidget     *frame;
+  GtkWidget     *table;
+  GtkAdjustment *adj;
+  gint           row;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
@@ -3771,22 +3771,22 @@ static void
 ed_make_page_sflare (GFlareEditor *ed,
                      GtkWidget    *notebook)
 {
-  GFlare       *gflare = ed->gflare;
-  GradientMenu *gm;
-  GtkWidget    *vbox;
-  GtkWidget    *table;
-  GtkWidget    *frame;
-  GtkWidget    *shape_vbox;
-  GSList       *shape_group = NULL;
-  GtkWidget    *polygon_hbox;
-  GtkWidget    *seed_hbox;
-  GtkWidget    *toggle;
-  GtkWidget    *label;
-  GtkWidget    *seed;
-  GtkWidget    *entry;
-  GtkObject    *adj;
-  gchar         buf[256];
-  gint          row;
+  GFlare        *gflare = ed->gflare;
+  GradientMenu  *gm;
+  GtkWidget     *vbox;
+  GtkWidget     *table;
+  GtkWidget     *frame;
+  GtkWidget     *shape_vbox;
+  GSList        *shape_group = NULL;
+  GtkWidget     *polygon_hbox;
+  GtkWidget     *seed_hbox;
+  GtkWidget     *toggle;
+  GtkWidget     *label;
+  GtkWidget     *seed;
+  GtkWidget     *entry;
+  GtkAdjustment *adj;
+  gchar          buf[256];
+  gint           row;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);