[gimp/gtk3-port: 42/228] app: s/GtkObject/GtkAdjustment/ in app/dialogs/



commit e380e0f91793a8c623bdfa3bdc6294516a85b45c
Author: Michael Natterer <mitch gimp org>
Date:   Tue Oct 19 13:07:46 2010 +0200

    app: s/GtkObject/GtkAdjustment/ in app/dialogs/

 app/dialogs/channel-options-dialog.c |    2 +-
 app/dialogs/convert-type-dialog.c    |    2 +-
 app/dialogs/layer-options-dialog.c   |    2 +-
 app/dialogs/offset-dialog.c          |   26 +++++++++++-----------
 app/dialogs/palette-import-dialog.c  |   39 ++++++++++++++-------------------
 app/dialogs/print-size-dialog.c      |    2 +-
 app/dialogs/resize-dialog.c          |   30 +++++++++++++-------------
 7 files changed, 49 insertions(+), 54 deletions(-)
---
diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c
index 778dbce..c78652f 100644
--- a/app/dialogs/channel-options-dialog.c
+++ b/app/dialogs/channel-options-dialog.c
@@ -69,7 +69,7 @@ channel_options_dialog_new (GimpImage     *image,
   GtkWidget            *hbox;
   GtkWidget            *vbox;
   GtkWidget            *table;
-  GtkObject            *opacity_adj;
+  GtkAdjustment        *opacity_adj;
 
   g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
   g_return_val_if_fail (channel == NULL || GIMP_IS_CHANNEL (channel), NULL);
diff --git a/app/dialogs/convert-type-dialog.c b/app/dialogs/convert-type-dialog.c
index e5ec88b..fef7988 100644
--- a/app/dialogs/convert-type-dialog.c
+++ b/app/dialogs/convert-type-dialog.c
@@ -100,7 +100,7 @@ convert_type_dialog_new (GimpImage    *image,
   GtkWidget     *vbox;
   GtkWidget     *hbox;
   GtkWidget     *label;
-  GtkObject     *adjustment;
+  GtkAdjustment *adjustment;
   GtkWidget     *spinbutton;
   GtkWidget     *frame;
   GtkWidget     *toggle;
diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c
index 66602e8..a93e34c 100644
--- a/app/dialogs/layer-options-dialog.c
+++ b/app/dialogs/layer-options-dialog.c
@@ -68,7 +68,7 @@ layer_options_dialog_new (GimpImage    *image,
   GtkWidget          *vbox;
   GtkWidget          *table;
   GtkWidget          *label;
-  GtkObject          *adjustment;
+  GtkAdjustment      *adjustment;
   GtkWidget          *spinbutton;
   GtkWidget          *frame;
   GtkWidget          *button;
diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c
index 219066c..c631244 100644
--- a/app/dialogs/offset-dialog.c
+++ b/app/dialogs/offset-dialog.c
@@ -81,19 +81,19 @@ offset_dialog_new (GimpDrawable *drawable,
                    GimpContext  *context,
                    GtkWidget    *parent)
 {
-  GimpItem     *item;
-  OffsetDialog *dialog;
-  GtkWidget    *main_vbox;
-  GtkWidget    *vbox;
-  GtkWidget    *hbox;
-  GtkWidget    *button;
-  GtkWidget    *spinbutton;
-  GtkWidget    *frame;
-  GtkWidget    *radio_button;
-  GtkObject    *adjustment;
-  gdouble       xres;
-  gdouble       yres;
-  const gchar  *title = NULL;
+  GimpItem      *item;
+  OffsetDialog  *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *vbox;
+  GtkWidget     *hbox;
+  GtkWidget     *button;
+  GtkWidget     *spinbutton;
+  GtkWidget     *frame;
+  GtkWidget     *radio_button;
+  GtkAdjustment *adjustment;
+  gdouble        xres;
+  gdouble        yres;
+  const gchar   *title = NULL;
 
   g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
   g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c
index 151c33f..8a0d28b 100644
--- a/app/dialogs/palette-import-dialog.c
+++ b/app/dialogs/palette-import-dialog.c
@@ -320,12 +320,11 @@ palette_import_dialog_new (GimpContext *context)
                              dialog->entry, 2, FALSE);
 
   /*  The # of colors  */
-  dialog->num_colors =
-    GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
-                                          _("N_umber of colors:"), -1, 5,
-                                          256, 2, 10000, 1, 10, 0,
-                                          TRUE, 0.0, 0.0,
-                                          NULL, NULL));
+  dialog->num_colors = gimp_scale_entry_new (GTK_TABLE (table), 0, 1,
+                                             _("N_umber of colors:"), -1, 5,
+                                             256, 2, 10000, 1, 10, 0,
+                                             TRUE, 0.0, 0.0,
+                                             NULL, NULL);
 
   g_signal_connect_swapped (dialog->num_colors,
                             "value-changed",
@@ -333,24 +332,22 @@ palette_import_dialog_new (GimpContext *context)
                             dialog);
 
   /*  The columns  */
-  dialog->columns =
-    GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
+  dialog->columns = gimp_scale_entry_new (GTK_TABLE (table), 0, 2,
                                           _("C_olumns:"), -1, 5,
                                           16, 0, 64, 1, 8, 0,
                                           TRUE, 0.0, 0.0,
-                                          NULL, NULL));
+                                          NULL, NULL);
 
   g_signal_connect (dialog->columns, "value-changed",
                     G_CALLBACK (palette_import_columns_changed),
                     dialog);
 
   /*  The interval  */
-  dialog->threshold =
-    GTK_ADJUSTMENT (gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
-                                          _("I_nterval:"), -1, 5,
-                                          1, 1, 128, 1, 8, 0,
-                                          TRUE, 0.0, 0.0,
-                                          NULL, NULL));
+  dialog->threshold = gimp_scale_entry_new (GTK_TABLE (table), 0, 3,
+                                            _("I_nterval:"), -1, 5,
+                                            1, 1, 128, 1, 8, 0,
+                                            TRUE, 0.0, 0.0,
+                                            NULL, NULL);
 
   g_signal_connect_swapped (dialog->threshold, "value-changed",
                             G_CALLBACK (palette_import_make_palette),
@@ -522,10 +519,8 @@ palette_import_image_changed (GimpContext  *context,
 
       gtk_widget_set_sensitive (dialog->sample_merged_toggle, sensitive);
       gtk_widget_set_sensitive (dialog->selection_only_toggle, sensitive);
-      gimp_scale_entry_set_sensitive (GTK_OBJECT (dialog->threshold),
-                                      sensitive);
-      gimp_scale_entry_set_sensitive (GTK_OBJECT (dialog->num_colors),
-                                      sensitive);
+      gimp_scale_entry_set_sensitive (dialog->threshold, sensitive);
+      gimp_scale_entry_set_sensitive (dialog->num_colors, sensitive);
     }
 
   if (dialog->image)
@@ -635,9 +630,9 @@ palette_import_set_sensitive (ImportDialog *dialog)
   gtk_widget_set_sensitive (dialog->selection_only_toggle, image);
   gtk_widget_set_sensitive (dialog->file_chooser,          file);
 
-  gimp_scale_entry_set_sensitive (GTK_OBJECT (dialog->num_colors), ! file);
-  gimp_scale_entry_set_sensitive (GTK_OBJECT (dialog->columns),    ! file);
-  gimp_scale_entry_set_sensitive (GTK_OBJECT (dialog->threshold),  image);
+  gimp_scale_entry_set_sensitive (dialog->num_colors, ! file);
+  gimp_scale_entry_set_sensitive (dialog->columns,    ! file);
+  gimp_scale_entry_set_sensitive (dialog->threshold,  image);
 }
 
 static void
diff --git a/app/dialogs/print-size-dialog.c b/app/dialogs/print-size-dialog.c
index 0b847e0..bf90d74 100644
--- a/app/dialogs/print-size-dialog.c
+++ b/app/dialogs/print-size-dialog.c
@@ -93,7 +93,7 @@ print_size_dialog_new (GimpImage              *image,
   GtkWidget       *height;
   GtkWidget       *hbox;
   GtkWidget       *chain;
-  GtkObject       *adj;
+  GtkAdjustment   *adj;
   GList           *focus_chain = NULL;
 
   g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c
index b11b4de..0b06f16 100644
--- a/app/dialogs/resize-dialog.c
+++ b/app/dialogs/resize-dialog.c
@@ -90,21 +90,21 @@ resize_dialog_new (GimpViewable       *viewable,
                    GimpResizeCallback  callback,
                    gpointer            user_data)
 {
-  GtkWidget    *dialog;
-  GtkWidget    *main_vbox;
-  GtkWidget    *vbox;
-  GtkWidget    *abox;
-  GtkWidget    *frame;
-  GtkWidget    *button;
-  GtkWidget    *spinbutton;
-  GtkWidget    *entry;
-  GtkObject    *adjustment;
-  GdkPixbuf    *pixbuf;
-  ResizeDialog *private;
-  GimpImage    *image = NULL;
-  const gchar  *text  = NULL;
-  gint          width, height;
-  gdouble       xres, yres;
+  GtkWidget     *dialog;
+  GtkWidget     *main_vbox;
+  GtkWidget     *vbox;
+  GtkWidget     *abox;
+  GtkWidget     *frame;
+  GtkWidget     *button;
+  GtkWidget     *spinbutton;
+  GtkWidget     *entry;
+  GtkAdjustment *adjustment;
+  GdkPixbuf     *pixbuf;
+  ResizeDialog  *private;
+  GimpImage     *image = NULL;
+  const gchar   *text  = NULL;
+  gint           width, height;
+  gdouble        xres, yres;
 
   g_return_val_if_fail (GIMP_IS_VIEWABLE (viewable), NULL);
   g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);


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