[gimp/gtk3-port: 9/227] libgimpwidgets: s/GtkObject/GtkAdjustment/



commit 46f4e669a7747844e70322a44a0a47ebc9c42db1
Author: Michael Natterer <mitch gimp org>
Date:   Fri Oct 15 11:14:38 2010 +0200

    libgimpwidgets: s/GtkObject/GtkAdjustment/

 libgimpwidgets/gimpcolorscales.c  |    4 +-
 libgimpwidgets/gimpmemsizeentry.c |    2 +-
 libgimpwidgets/gimpquerybox.c     |   12 +++---
 libgimpwidgets/gimpscaleentry.c   |   32 ++++++++--------
 libgimpwidgets/gimpscaleentry.h   |   78 ++++++++++++++++++------------------
 5 files changed, 64 insertions(+), 64 deletions(-)
---
diff --git a/libgimpwidgets/gimpcolorscales.c b/libgimpwidgets/gimpcolorscales.c
index d477c25..b900131 100644
--- a/libgimpwidgets/gimpcolorscales.c
+++ b/libgimpwidgets/gimpcolorscales.c
@@ -66,7 +66,7 @@ struct _GimpColorScales
 
   GtkWidget         *toggles[7];
   GtkWidget         *sliders[7];
-  GtkObject         *slider_data[7];
+  GtkAdjustment     *slider_data[7];
 };
 
 struct _GimpColorScalesClass
@@ -346,7 +346,7 @@ gimp_color_scales_scale_update (GtkAdjustment   *adjustment,
   gint               i;
 
   for (i = 0; i < 7; i++)
-    if (scales->slider_data[i] == GTK_OBJECT (adjustment))
+    if (scales->slider_data[i] == adjustment)
       break;
 
   switch (i)
diff --git a/libgimpwidgets/gimpmemsizeentry.c b/libgimpwidgets/gimpmemsizeentry.c
index 4f9db41..16c1a68 100644
--- a/libgimpwidgets/gimpmemsizeentry.c
+++ b/libgimpwidgets/gimpmemsizeentry.c
@@ -173,7 +173,7 @@ gimp_memsize_entry_new (guint64  value,
                         guint64  upper)
 {
   GimpMemsizeEntry *entry;
-  GtkObject        *adj;
+  GtkAdjustment    *adj;
   guint             shift;
 
 #if _MSC_VER < 1300
diff --git a/libgimpwidgets/gimpquerybox.c b/libgimpwidgets/gimpquerybox.c
index 5602b43..d8c8475 100644
--- a/libgimpwidgets/gimpquerybox.c
+++ b/libgimpwidgets/gimpquerybox.c
@@ -322,9 +322,9 @@ gimp_query_int_box (const gchar          *title,
                     GimpQueryIntCallback  callback,
                     gpointer              data)
 {
-  QueryBox  *query_box;
-  GtkWidget *spinbutton;
-  GtkObject *adjustment;
+  QueryBox      *query_box;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adjustment;
 
   query_box = create_query_box (title, parent, help_func, help_id,
                                 G_CALLBACK (int_query_box_response),
@@ -385,9 +385,9 @@ gimp_query_double_box (const gchar             *title,
                        GimpQueryDoubleCallback  callback,
                        gpointer                 data)
 {
-  QueryBox  *query_box;
-  GtkWidget *spinbutton;
-  GtkObject *adjustment;
+  QueryBox      *query_box;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adjustment;
 
   query_box = create_query_box (title, parent, help_func, help_id,
                                 G_CALLBACK (double_query_box_response),
diff --git a/libgimpwidgets/gimpscaleentry.c b/libgimpwidgets/gimpscaleentry.c
index a5ba52e..343b1b6 100644
--- a/libgimpwidgets/gimpscaleentry.c
+++ b/libgimpwidgets/gimpscaleentry.c
@@ -38,7 +38,7 @@ static void gimp_scale_entry_exp_adjustment_callback           (GtkAdjustment *a
 static void gimp_scale_entry_log_adjustment_callback           (GtkAdjustment *adjustment,
                                                                 GtkAdjustment *other_adj);
 
-static GtkObject * gimp_scale_entry_new_internal               (gboolean       color_scale,
+static GtkAdjustment * gimp_scale_entry_new_internal           (gboolean       color_scale,
                                                                 GtkTable      *table,
                                                                 gint           column,
                                                                 gint           row,
@@ -117,7 +117,7 @@ gimp_scale_entry_exp_adjustment_callback (GtkAdjustment *adjustment,
                                      adjustment);
 }
 
-static GtkObject *
+static GtkAdjustment *
 gimp_scale_entry_new_internal (gboolean     color_scale,
                                GtkTable    *table,
                                gint         column,
@@ -137,11 +137,11 @@ gimp_scale_entry_new_internal (gboolean     color_scale,
                                const gchar *tooltip,
                                const gchar *help_id)
 {
-  GtkWidget *label;
-  GtkWidget *scale;
-  GtkWidget *spinbutton;
-  GtkObject *adjustment;
-  GtkObject *return_adj;
+  GtkWidget     *label;
+  GtkWidget     *scale;
+  GtkWidget     *spinbutton;
+  GtkAdjustment *adjustment;
+  GtkAdjustment *return_adj;
 
   label = gtk_label_new_with_mnemonic (text);
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -154,7 +154,7 @@ gimp_scale_entry_new_internal (gboolean     color_scale,
       unconstrained_lower <= lower &&
       unconstrained_upper >= upper)
     {
-      GtkObject *constrained_adj;
+      GtkAdjustment *constrained_adj;
 
       constrained_adj = gtk_adjustment_new (value, lower, upper,
                                             step_increment, page_increment,
@@ -270,7 +270,7 @@ gimp_scale_entry_new_internal (gboolean     color_scale,
  *
  * Returns: The #GtkSpinButton's #GtkAdjustment.
  **/
-GtkObject *
+GtkAdjustment *
 gimp_scale_entry_new (GtkTable    *table,
                       gint         column,
                       gint         row,
@@ -324,7 +324,7 @@ gimp_scale_entry_new (GtkTable    *table,
  *
  * Returns: The #GtkSpinButton's #GtkAdjustment.
  **/
-GtkObject *
+GtkAdjustment *
 gimp_color_scale_entry_new (GtkTable    *table,
                             gint         column,
                             gint         row,
@@ -364,8 +364,8 @@ gimp_color_scale_entry_new (GtkTable    *table,
  * Since: GIMP 2.2
  **/
 void
-gimp_scale_entry_set_logarithmic (GtkObject *adjustment,
-                                  gboolean   logarithmic)
+gimp_scale_entry_set_logarithmic (GtkAdjustment *adjustment,
+                                  gboolean       logarithmic)
 {
   GtkAdjustment *adj;
   GtkAdjustment *scale_adj;
@@ -401,7 +401,7 @@ gimp_scale_entry_set_logarithmic (GtkObject *adjustment,
 
       if (scale_adj == adj)
         {
-          GtkObject *new_adj;
+          GtkAdjustment *new_adj;
 
           new_adj = gtk_adjustment_new (gtk_adjustment_get_value (scale_adj),
                                         gtk_adjustment_get_lower (scale_adj),
@@ -491,7 +491,7 @@ gimp_scale_entry_set_logarithmic (GtkObject *adjustment,
  * Since: GIMP 2.2
  **/
 gboolean
-gimp_scale_entry_get_logarithmic (GtkObject *adjustment)
+gimp_scale_entry_get_logarithmic (GtkAdjustment *adjustment)
 {
   return GPOINTER_TO_INT (g_object_get_data (G_OBJECT (adjustment),
                                              "logarithmic"));
@@ -507,8 +507,8 @@ gimp_scale_entry_get_logarithmic (GtkObject *adjustment)
  * #GtkSpinButton.
  **/
 void
-gimp_scale_entry_set_sensitive (GtkObject *adjustment,
-                                gboolean   sensitive)
+gimp_scale_entry_set_sensitive (GtkAdjustment *adjustment,
+                                gboolean       sensitive)
 {
   GtkWidget *widget;
 
diff --git a/libgimpwidgets/gimpscaleentry.h b/libgimpwidgets/gimpscaleentry.h
index 18ef244..bca63ac 100644
--- a/libgimpwidgets/gimpscaleentry.h
+++ b/libgimpwidgets/gimpscaleentry.h
@@ -78,45 +78,45 @@ G_BEGIN_DECLS
         (GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (adj), "spinbutton")))
 
 
-GtkObject * gimp_scale_entry_new             (GtkTable    *table,
-                                              gint         column,
-                                              gint         row,
-                                              const gchar *text,
-                                              gint         scale_width,
-                                              gint         spinbutton_width,
-                                              gdouble      value,
-                                              gdouble      lower,
-                                              gdouble      upper,
-                                              gdouble      step_increment,
-                                              gdouble      page_increment,
-                                              guint        digits,
-                                              gboolean     constrain,
-                                              gdouble      unconstrained_lower,
-                                              gdouble      unconstrained_upper,
-                                              const gchar *tooltip,
-                                              const gchar *help_id);
-
-GtkObject * gimp_color_scale_entry_new       (GtkTable    *table,
-                                              gint         column,
-                                              gint         row,
-                                              const gchar *text,
-                                              gint         scale_width,
-                                              gint         spinbutton_width,
-                                              gdouble      value,
-                                              gdouble      lower,
-                                              gdouble      upper,
-                                              gdouble      step_increment,
-                                              gdouble      page_increment,
-                                              guint        digits,
-                                              const gchar *tooltip,
-                                              const gchar *help_id);
-
-void        gimp_scale_entry_set_sensitive   (GtkObject   *adjustment,
-                                              gboolean     sensitive);
-
-void        gimp_scale_entry_set_logarithmic (GtkObject   *adjustment,
-                                              gboolean     logarithmic);
-gboolean    gimp_scale_entry_get_logarithmic (GtkObject   *adjustment);
+GtkAdjustment * gimp_scale_entry_new             (GtkTable    *table,
+                                                  gint         column,
+                                                  gint         row,
+                                                  const gchar *text,
+                                                  gint         scale_width,
+                                                  gint         spinbutton_width,
+                                                  gdouble      value,
+                                                  gdouble      lower,
+                                                  gdouble      upper,
+                                                  gdouble      step_increment,
+                                                  gdouble      page_increment,
+                                                  guint        digits,
+                                                  gboolean     constrain,
+                                                  gdouble      unconstrained_lower,
+                                                  gdouble      unconstrained_upper,
+                                                  const gchar *tooltip,
+                                                  const gchar *help_id);
+
+GtkAdjustment * gimp_color_scale_entry_new       (GtkTable    *table,
+                                                  gint         column,
+                                                  gint         row,
+                                                  const gchar *text,
+                                                  gint         scale_width,
+                                                  gint         spinbutton_width,
+                                                  gdouble      value,
+                                                  gdouble      lower,
+                                                  gdouble      upper,
+                                                  gdouble      step_increment,
+                                                  gdouble      page_increment,
+                                                  guint        digits,
+                                                  const gchar *tooltip,
+                                                  const gchar *help_id);
+
+void            gimp_scale_entry_set_sensitive   (GtkAdjustment *adjustment,
+                                                  gboolean       sensitive);
+
+void            gimp_scale_entry_set_logarithmic (GtkAdjustment *adjustment,
+                                                  gboolean       logarithmic);
+gboolean        gimp_scale_entry_get_logarithmic (GtkAdjustment *adjustment);
 
 
 


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