label: refactor code

[~andy/gtk] / gtk / gtkaccessible.c

diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c
index e999b092d7c2a8c8f591e3a625bea7239130f255..27d88ca00ea35b178118fdd8dd0cf5eefba11e27 100644 (file)
--- a/gtk/gtkaccessible.c
+++ b/gtk/gtkaccessible.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"
@@ -103,27 +101,56 @@ gtk_accessible_init (GtkAccessible *accessible)
                                                   GtkAccessiblePrivate);
 }
 
+static AtkStateSet *
+gtk_accessible_ref_state_set (AtkObject *object)
+{
+  GtkAccessible *accessible = GTK_ACCESSIBLE (object);
+  AtkStateSet *state_set;
+
+  state_set = ATK_OBJECT_CLASS (gtk_accessible_parent_class)->ref_state_set (object);
+
+  if (accessible->priv->widget == NULL)
+    atk_state_set_add_state (state_set, ATK_STATE_DEFUNCT);
+
+  return state_set;
+}
+
 static void
 gtk_accessible_real_widget_set (GtkAccessible *accessible)
 {
+  atk_object_notify_state_change (ATK_OBJECT (accessible), ATK_STATE_DEFUNCT, FALSE);
 }
 
 static void
 gtk_accessible_real_widget_unset (GtkAccessible *accessible)
 {
+  atk_object_notify_state_change (ATK_OBJECT (accessible), ATK_STATE_DEFUNCT, TRUE);
+}
+
+static void
+gtk_accessible_dispose (GObject *object)
+{
+  GtkAccessible *accessible = GTK_ACCESSIBLE (object);
+  
+  gtk_accessible_set_widget (accessible, NULL);
+
+  G_OBJECT_CLASS (gtk_accessible_parent_class)->dispose (object);
 }
 
 static void
 gtk_accessible_class_init (GtkAccessibleClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  AtkObjectClass *atkobject_class = ATK_OBJECT_CLASS (klass);
 
   klass->connect_widget_destroyed = gtk_accessible_real_connect_widget_destroyed;
   klass->widget_set = gtk_accessible_real_widget_set;
   klass->widget_unset = gtk_accessible_real_widget_unset;
 
+  atkobject_class->ref_state_set = gtk_accessible_ref_state_set;
   gobject_class->get_property = gtk_accessible_get_property;
   gobject_class->set_property = gtk_accessible_set_property;
+  gobject_class->dispose = gtk_accessible_dispose;
 
   g_object_class_install_property (gobject_class,
                                   PROP_WIDGET,
@@ -169,7 +196,7 @@ gtk_accessible_set_widget (GtkAccessible *accessible,
 
   priv->widget = widget;
 
-  if (widget);
+  if (widget)
     klass->widget_set (accessible);
 
   g_object_notify (G_OBJECT (accessible), "widget");
@@ -202,6 +229,8 @@ gtk_accessible_get_widget (GtkAccessible *accessible)
  *
  * This function specifies the callback function to be called
  * when the widget corresponding to a GtkAccessible is destroyed.
+ *
+ * Deprecated: 3.4: Use gtk_accessible_set_widget() and its vfuncs.
  */
 void
 gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible)
@@ -216,6 +245,13 @@ gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible)
     class->connect_widget_destroyed (accessible);
 }
 
+static void
+gtk_accessible_widget_destroyed (GtkWidget     *widget,
+                                 GtkAccessible *accessible)
+{
+  gtk_accessible_set_widget (accessible, NULL);
+}
+
 static void
 gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
 {
@@ -223,5 +259,5 @@ gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
 
   if (priv->widget)
     g_signal_connect (priv->widget, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed), &priv->widget);
+                      G_CALLBACK (gtk_accessible_widget_destroyed), accessible);
 }