colorscale: Remove priv pointer

diff --git a/gtk/gtkcolorscale.c b/gtk/gtkcolorscale.c
index 3f529517653bd5b0d018bc90ce50ab316528c6dd..16034ae984714c50b65c78875cdc063c680ac72c 100644 (file)
--- a/gtk/gtkcolorscale.c
+++ b/gtk/gtkcolorscale.c
@@ -32,11 +32,11 @@
 
 #include <math.h>
 
-struct _GtkColorScalePrivate
+typedef struct
 {
   GdkRGBA color;
   GtkColorScaleType type;
-};
+} GtkColorScalePrivate;
 
 enum
 {
@@ -59,12 +59,13 @@ gtk_color_scale_snapshot_trough (GtkColorScale  *scale,
                                  int             width,
                                  int             height)
 {
+  GtkColorScalePrivate *priv = gtk_color_scale_get_instance_private (scale);
   GtkWidget *widget = GTK_WIDGET (scale);
 
   if (width <= 1 || height <= 1)
     return;
 
-  if (scale->priv->type == GTK_COLOR_SCALE_HUE)
+  if (priv->type == GTK_COLOR_SCALE_HUE)
     {
       GdkTexture *texture;
       gint stride;
@@ -104,7 +105,7 @@ gtk_color_scale_snapshot_trough (GtkColorScale  *scale,
                                    &GRAPHENE_RECT_INIT(x, y, width, height));
       g_object_unref (texture);
     }
-  else if (scale->priv->type == GTK_COLOR_SCALE_ALPHA)
+  else if (priv->type == GTK_COLOR_SCALE_ALPHA)
     {
       cairo_t *cr;
       graphene_point_t start, end;
@@ -143,8 +144,8 @@ gtk_color_scale_snapshot_trough (GtkColorScale  *scale,
 
       cairo_destroy (cr);
 
-      color = &scale->priv->color;
-      
+      color = &priv->color;
+
       gtk_snapshot_append_linear_gradient (snapshot,
                                            &GRAPHENE_RECT_INIT(x, y, width, height),
                                            &start,
@@ -163,8 +164,6 @@ gtk_color_scale_init (GtkColorScale *scale)
   GtkStyleContext *context;
   GtkGesture *gesture;
 
-  scale->priv = gtk_color_scale_get_instance_private (scale);
-
   gesture = gtk_gesture_long_press_new ();
   g_signal_connect (gesture, "pressed",
                     G_CALLBACK (hold_action), scale);
@@ -183,11 +182,12 @@ scale_get_property (GObject    *object,
                     GParamSpec *pspec)
 {
   GtkColorScale *scale = GTK_COLOR_SCALE (object);
+  GtkColorScalePrivate *priv = gtk_color_scale_get_instance_private (scale);
 
   switch (prop_id)
     {
     case PROP_SCALE_TYPE:
-      g_value_set_int (value, scale->priv->type);
+      g_value_set_int (value, priv->type);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -199,9 +199,10 @@ static void
 scale_set_type (GtkColorScale     *scale,
                 GtkColorScaleType  type)
 {
+  GtkColorScalePrivate *priv = gtk_color_scale_get_instance_private (scale);
   AtkObject *atk_obj;
 
-  scale->priv->type = type;
+  priv->type = type;
 
   atk_obj = gtk_widget_get_accessible (GTK_WIDGET (scale));
   if (GTK_IS_ACCESSIBLE (atk_obj))
@@ -262,7 +263,9 @@ void
 gtk_color_scale_set_rgba (GtkColorScale *scale,
                           const GdkRGBA *color)
 {
-  scale->priv->color = *color;
+  GtkColorScalePrivate *priv = gtk_color_scale_get_instance_private (scale);
+
+  priv->color = *color;
   gtk_widget_queue_draw (GTK_WIDGET (scale));
 }
 

diff --git a/gtk/gtkcolorscaleprivate.h b/gtk/gtkcolorscaleprivate.h
index e1a54254b46e461d8a7294147d60efc820ce9715..f87a40221efd947cb4fd1285c50e8ef176e59ba7 100644 (file)
--- a/gtk/gtkcolorscaleprivate.h
+++ b/gtk/gtkcolorscaleprivate.h
@@ -32,13 +32,10 @@ G_BEGIN_DECLS
 
 typedef struct _GtkColorScale         GtkColorScale;
 typedef struct _GtkColorScaleClass    GtkColorScaleClass;
-typedef struct _GtkColorScalePrivate  GtkColorScalePrivate;
 
 struct _GtkColorScale
 {
   GtkScale parent_instance;
-
-  GtkColorScalePrivate *priv;
 };
 
 struct _GtkColorScaleClass