[gimp/gtk3-port: 40/233] app: s/GtkObject/GtkAdjustment/ in app/dialogs/



commit f7ed86516e63db56d79067849854cc04eb62e286
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/palette-import-dialog.c  |   39 ++++++++++++++-------------------
 2 files changed, 18 insertions(+), 23 deletions(-)
---
diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c
index 98c16c6..7bf2913 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/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c
index 8618bec..b54f798 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


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