GtkMenuItemAccessible: implement selectable/selected states

[~andy/gtk] / gtk / a11y / gtkrenderercellaccessible.c

diff --git a/gtk/a11y/gtkrenderercellaccessible.c b/gtk/a11y/gtkrenderercellaccessible.c
index 3b2c399c616613edbf0dc457557ca47cc81d5e23..6c26897980da8f46c68841f012f53f063b332a00 100644 (file)
--- a/gtk/a11y/gtkrenderercellaccessible.c
+++ b/gtk/a11y/gtkrenderercellaccessible.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -23,6 +21,10 @@
 #include "gtkrenderercellaccessible.h"
 #include "gtkintl.h"
 
+struct _GtkRendererCellAccessiblePrivate
+{
+  GtkCellRenderer *renderer;
+};
 
 enum {
   PROP_0,
@@ -42,7 +44,7 @@ gtk_renderer_cell_accessible_set_property (GObject         *object,
   switch (prop_id)
     {
     case PROP_RENDERER:
-      accessible->renderer = g_value_dup_object (value);
+      accessible->priv->renderer = g_value_dup_object (value);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -61,7 +63,7 @@ gtk_renderer_cell_accessible_get_property (GObject         *object,
   switch (prop_id)
     {
     case PROP_RENDERER:
-      g_value_set_object (value, accessible->renderer);
+      g_value_set_object (value, accessible->priv->renderer);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -74,8 +76,8 @@ gtk_renderer_cell_accessible_finalize (GObject *object)
 {
   GtkRendererCellAccessible *renderer_cell = GTK_RENDERER_CELL_ACCESSIBLE (object);
 
-  if (renderer_cell->renderer)
-    g_object_unref (renderer_cell->renderer);
+  if (renderer_cell->priv->renderer)
+    g_object_unref (renderer_cell->priv->renderer);
 
   G_OBJECT_CLASS (_gtk_renderer_cell_accessible_parent_class)->finalize (object);
 }
@@ -96,24 +98,16 @@ _gtk_renderer_cell_accessible_class_init (GtkRendererCellAccessibleClass *klass)
                                                        P_("The cell renderer represented by this accessible"),
                                                        GTK_TYPE_CELL_RENDERER,
                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  g_type_class_add_private (klass, sizeof (GtkRendererCellAccessiblePrivate));
 }
 
 static void
 _gtk_renderer_cell_accessible_init (GtkRendererCellAccessible *renderer_cell)
 {
-}
-
-void
-_gtk_renderer_cell_accessible_update_cache (GtkRendererCellAccessible *cell)
-{
-  GtkRendererCellAccessibleClass *klass;
-  
-  g_return_if_fail (GTK_IS_RENDERER_CELL_ACCESSIBLE (cell));
-
-  klass = GTK_RENDERER_CELL_ACCESSIBLE_GET_CLASS (cell);
-
-  if (klass->update_cache)
-    klass->update_cache (cell);
+  renderer_cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (renderer_cell,
+                                                     GTK_TYPE_RENDERER_CELL_ACCESSIBLE,
+                                                     GtkRendererCellAccessiblePrivate);
 }
 
 AtkObject *