Change FSF Address

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

diff --git a/gtk/a11y/gtkcellaccessible.c b/gtk/a11y/gtkcellaccessible.c
index 3d39708ba96eb760dd28fb5d38055d407b255e60..5d29dbbd7cad497f8a527642d39bcfb63d04acd4 100644 (file)
--- a/gtk/a11y/gtkcellaccessible.c
+++ b/gtk/a11y/gtkcellaccessible.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"
@@ -42,7 +40,7 @@ static const struct {
 static void atk_action_interface_init    (AtkActionIface    *iface);
 static void atk_component_interface_init (AtkComponentIface *iface);
 
-G_DEFINE_TYPE_WITH_CODE (GtkCellAccessible, _gtk_cell_accessible, ATK_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (GtkCellAccessible, _gtk_cell_accessible, GTK_TYPE_ACCESSIBLE,
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
 
@@ -87,7 +85,7 @@ gtk_cell_accessible_get_index_in_parent (AtkObject *obj)
   if (GTK_IS_CONTAINER_CELL_ACCESSIBLE (parent))
     return g_list_index (GTK_CONTAINER_CELL_ACCESSIBLE (parent)->children, obj);
 
-  parent = gtk_widget_get_accessible (cell->widget);
+  parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell)));
   if (parent == NULL)
     return -1;
 
@@ -106,7 +104,7 @@ gtk_cell_accessible_ref_state_set (AtkObject *accessible)
 
   state_set = atk_state_set_new ();
 
-  if (cell_accessible->widget == NULL)
+  if (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell_accessible)) == NULL)
     {
       atk_state_set_add_state (state_set, ATK_STATE_DEFUNCT);
       return state_set;
@@ -133,7 +131,7 @@ gtk_cell_accessible_ref_state_set (AtkObject *accessible)
         }
     }
 
-  if (gtk_widget_get_mapped (cell_accessible->widget))
+  if (gtk_widget_get_mapped (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell_accessible))))
     atk_state_set_add_state (state_set, ATK_STATE_SHOWING);
 
   return state_set;
@@ -155,14 +153,6 @@ _gtk_cell_accessible_class_init (GtkCellAccessibleClass *klass)
 static void
 _gtk_cell_accessible_init (GtkCellAccessible *cell)
 {
-  cell->widget = NULL;
-}
-
-static void
-widget_destroyed (GtkWidget         *widget,
-                  GtkCellAccessible *cell)
-{
-  cell->widget = NULL;
 }
 
 void
@@ -170,11 +160,8 @@ _gtk_cell_accessible_initialise (GtkCellAccessible *cell,
                                  GtkWidget         *widget,
                                  AtkObject         *parent)
 {
-  cell->widget = widget;
+  gtk_accessible_set_widget (GTK_ACCESSIBLE (cell), widget);
   atk_object_set_parent (ATK_OBJECT (cell), parent);
-
-  g_signal_connect_object (G_OBJECT (widget), "destroy",
-                           G_CALLBACK (widget_destroyed), cell, 0);
 }
 
 gboolean
@@ -291,10 +278,10 @@ gtk_cell_accessible_action_do_action (AtkAction *action,
   GtkCellAccessibleParent *parent;
 
   cell = GTK_CELL_ACCESSIBLE (action);
-  if (cell->widget == NULL)
+  if (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell)) == NULL)
     return FALSE;
 
-  parent = GTK_CELL_ACCESSIBLE_PARENT (gtk_widget_get_accessible (cell->widget));
+  parent = GTK_CELL_ACCESSIBLE_PARENT (gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell))));
 
   switch (index)
     {
@@ -333,7 +320,7 @@ gtk_cell_accessible_get_extents (AtkComponent *component,
   AtkObject *parent;
 
   cell = GTK_CELL_ACCESSIBLE (component);
-  parent = gtk_widget_get_accessible (cell->widget);
+  parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell)));
 
   _gtk_cell_accessible_parent_get_cell_extents (GTK_CELL_ACCESSIBLE_PARENT (parent),
                                                 cell,
@@ -347,7 +334,7 @@ gtk_cell_accessible_grab_focus (AtkComponent *component)
   AtkObject *parent;
 
   cell = GTK_CELL_ACCESSIBLE (component);
-  parent = gtk_widget_get_accessible (cell->widget);
+  parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell)));
 
   return _gtk_cell_accessible_parent_grab_focus (GTK_CELL_ACCESSIBLE_PARENT (parent), cell);
 }
@@ -359,29 +346,6 @@ atk_component_interface_init (AtkComponentIface *iface)
   iface->grab_focus = gtk_cell_accessible_grab_focus;
 }
 
-/**
- * _gtk_cell_accessible_set_cell_data:
- * @cell: a #GtkCellAccessible
- *
- * Sets the cell data to the row used by @cell. This is useful in
- * particular if you want to work with cell renderers.
- *
- * Note that this function is potentially slow, so be careful.
- **/
-void
-_gtk_cell_accessible_set_cell_data (GtkCellAccessible *cell)
-{
-  AtkObject *parent;
-
-  g_return_if_fail (GTK_IS_CELL_ACCESSIBLE (cell));
-
-  parent = gtk_widget_get_accessible (cell->widget);
-  if (parent == NULL)
-    return;
-
-  _gtk_cell_accessible_parent_set_cell_data (GTK_CELL_ACCESSIBLE_PARENT (parent), cell);
-}
-
 /**
  * _gtk_cell_accessible_get_state:
  * @cell: a #GtkCellAccessible
@@ -397,7 +361,7 @@ _gtk_cell_accessible_get_state (GtkCellAccessible *cell)
 
   g_return_val_if_fail (GTK_IS_CELL_ACCESSIBLE (cell), 0);
 
-  parent = gtk_widget_get_accessible (cell->widget);
+  parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell)));
   if (parent == NULL)
     return 0;