gtkaccessible: Move public members to private structure

diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c
index 3a42ccd28c06994df96a0a2a837fb87ec4828b7b..228f88f1df81ad868ab8056025000b3e3f236e02 100644 (file)
--- a/gtk/gtkaccessible.c
+++ b/gtk/gtkaccessible.c
@@ -30,20 +30,34 @@
  * @Title: GtkAccessible
  */
 
+/*
+ * GtkAccessiblePriv:
+ * @widget: The GtkWidget whose properties and features are exported via this
+ *   accessible instance
+ */
+struct _GtkAccessiblePriv
+{
+  GtkWidget *widget;
+};
 
 static void gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible);
 
 G_DEFINE_TYPE (GtkAccessible, gtk_accessible, ATK_TYPE_OBJECT)
 
 static void
-gtk_accessible_init (GtkAccessible *object)
+gtk_accessible_init (GtkAccessible *accesible)
 {
+  accesible->priv = G_TYPE_INSTANCE_GET_PRIVATE (accesible,
+                                                 GTK_TYPE_ACCESSIBLE,
+                                                 GtkAccessiblePriv);
 }
 
 static void
 gtk_accessible_class_init (GtkAccessibleClass *klass)
 {
   klass->connect_widget_destroyed = gtk_accessible_real_connect_widget_destroyed;
+
+  g_type_class_add_private (klass, sizeof (GtkAccessiblePriv));
 }
 
 /**
@@ -61,7 +75,7 @@ gtk_accessible_set_widget (GtkAccessible *accessible,
 {
   g_return_if_fail (GTK_IS_ACCESSIBLE (accessible));
 
-  accessible->widget = widget;
+  accessible->priv->widget = widget;
 }
 
 /**
@@ -81,7 +95,7 @@ gtk_accessible_get_widget (GtkAccessible *accessible)
 {
   g_return_val_if_fail (GTK_IS_ACCESSIBLE (accessible), NULL);
 
-  return accessible->widget;
+  return accessible->priv->widget;
 }
 
 /**
@@ -107,11 +121,13 @@ gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible)
 static void
 gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
 {
-  if (accessible->widget)
+  GtkAccessiblePriv *priv = accessible->priv;
+
+  if (priv->widget)
   {
-    g_signal_connect (accessible->widget,
+    g_signal_connect (priv->widget,
                       "destroy",
                       G_CALLBACK (gtk_widget_destroyed),
-                      &accessible->widget);
+                      &priv->widget);
   }
 }

diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
index 1a79f158b2ff7e67e7202a2821d03ed1f4e9b535..584bcc5c41aa93774d95ad4fffcfff5d8db69760 100644 (file)
--- a/gtk/gtkaccessible.h
+++ b/gtk/gtkaccessible.h
@@ -37,6 +37,7 @@ G_BEGIN_DECLS
 #define GTK_ACCESSIBLE_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
 
 typedef struct _GtkAccessible                GtkAccessible;
+typedef struct _GtkAccessiblePriv            GtkAccessiblePriv;
 typedef struct _GtkAccessibleClass           GtkAccessibleClass;
 
   /*
@@ -46,11 +47,8 @@ struct _GtkAccessible
 {
   AtkObject parent;
 
-  /*
-   * The GtkWidget whose properties and features are exported via this 
-   * accessible instance.
-   */
-  GtkWidget *GSEAL (widget);
+  /*< private >*/
+  GtkAccessiblePriv *priv;
 };
 
 struct _GtkAccessibleClass