Change FSF Address

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

diff --git a/gtk/a11y/gtkcellaccessible.h b/gtk/a11y/gtkcellaccessible.h
index 234ca7d3dd04cb7a280d12cd00076c1d2a6ca707..a5584b42b89e959ae09db4c1000d2dcd2a3070c6 100644 (file)
--- a/gtk/a11y/gtkcellaccessible.h
+++ b/gtk/a11y/gtkcellaccessible.h
@@ -12,15 +12,14 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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/>.
  */
 
 #ifndef __GTK_CELL_ACCESSIBLE_H__
 #define __GTK_CELL_ACCESSIBLE_H__
 
 #include <atk/atk.h>
+#include "gtk/gtkaccessible.h"
 
 G_BEGIN_DECLS
 
@@ -36,46 +35,33 @@ typedef struct _GtkCellAccessibleClass GtkCellAccessibleClass;
 
 struct _GtkCellAccessible
 {
-  AtkObject parent;
-
-  GtkWidget    *widget;
-  /* This cached value is used only by atk_object_get_index_in_parent()
-   * which updates the value when it is stale.
-   */
-  gint         index;
-  AtkStateSet *state_set;
-  GList       *action_list;
-  void (*refresh_index) (GtkCellAccessible *cell);
+  GtkAccessible parent;
 };
 
 struct _GtkCellAccessibleClass
 {
-  AtkObjectClass parent_class;
+  GtkAccessibleClass parent_class;
+  void (*update_cache) (GtkCellAccessible *cell);
 };
 
 GType    _gtk_cell_accessible_get_type      (void);
 
+GtkCellRendererState
+         _gtk_cell_accessible_get_state     (GtkCellAccessible *cell);
+void     _gtk_cell_accessible_state_changed (GtkCellAccessible *cell,
+                                             GtkCellRendererState added,
+                                             GtkCellRendererState removed);
+void     _gtk_cell_accessible_update_cache  (GtkCellAccessible *cell);
+
 void     _gtk_cell_accessible_initialise    (GtkCellAccessible *cell,
                                              GtkWidget         *widget,
-                                             AtkObject         *parent,
-                                             gint               index);
+                                             AtkObject         *parent);
 gboolean _gtk_cell_accessible_add_state     (GtkCellAccessible *cell,
                                              AtkStateType       state_type,
                                              gboolean           emit_signal);
 gboolean _gtk_cell_accessible_remove_state  (GtkCellAccessible *cell,
                                              AtkStateType       state_type,
                                              gboolean           emit_signal);
-gboolean _gtk_cell_accessible_add_action    (GtkCellAccessible *cell,
-                                             const gchar       *name,
-                                             const gchar       *description,
-                                             const gchar       *keybinding,
-                                             void (*func) (GtkCellAccessible *));
-
-gboolean _gtk_cell_accessible_remove_action (GtkCellAccessible *cell,
-                                             gint               index);
-gboolean _gtk_cell_accessible_remove_action_by_name
-                                            (GtkCellAccessible *cell,
-                                             const gchar       *name);
 
 G_END_DECLS