[gimp/gtk3-port: 10/226] libgimpwidgets: s/GtkObject/GtkAdjustment/



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

    libgimpwidgets: s/GtkObject/GtkAdjustment/

 libgimpwidgets/gimpcolorscales.c |    4 +-
 libgimpwidgets/gimpscaleentry.c  |   22 +++++-----
 libgimpwidgets/gimpscaleentry.h  |   78 +++++++++++++++++++-------------------
 3 files changed, 52 insertions(+), 52 deletions(-)
---
diff --git a/libgimpwidgets/gimpcolorscales.c b/libgimpwidgets/gimpcolorscales.c
index aa41f89..9cbb61e 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/gimpscaleentry.c b/libgimpwidgets/gimpscaleentry.c
index 295a8f8..f7533a2 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,
@@ -241,7 +241,7 @@ gimp_scale_entry_new_internal (gboolean     color_scale,
   g_object_set_data (G_OBJECT (return_adj), "scale",      scale);
   g_object_set_data (G_OBJECT (return_adj), "spinbutton", spinbutton);
 
-  return GTK_OBJECT (return_adj);
+  return return_adj;
 }
 
 /**
@@ -273,7 +273,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,
@@ -327,7 +327,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,
@@ -367,8 +367,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;
@@ -404,7 +404,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),
@@ -494,7 +494,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"));
@@ -510,8 +510,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]