Practically everything changed.

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

diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c
index 817fab77ddfcf1c29bc3a73aa0581f73b9706e35..29618c299ae12f64fe87a34bd3a5bc2bfbf45013 100644 (file)
--- a/gtk/gtkaccessible.c
+++ b/gtk/gtkaccessible.c
@@ -1,4 +1,4 @@
-/* GTK - The GIMP Toolkit
+/* GTK - The GTK+ Toolkit
  * Copyright 2001 Sun Microsystems Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -17,46 +17,27 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include <string.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkaccessible.h>
 
-static void gtk_accessible_class_init (GtkAccessibleClass *klass);
+#include "gtkwidget.h"
+#include "gtkintl.h"
+#include "gtkaccessible.h"
+#include "gtkalias.h"
 
 static void gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible);
 
-GtkType
-gtk_accessible_get_type (void)
-{
-  static GtkType accessible_type = 0;
-
-  if (!accessible_type)
-    {
-      static const GTypeInfo accessible_info =
-      {
-       sizeof (GtkAccessibleClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_accessible_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkAccessible),
-       16,             /* n_preallocs */
-       (GInstanceInitFunc) NULL,
-      };
+G_DEFINE_TYPE (GtkAccessible, gtk_accessible, ATK_TYPE_OBJECT)
 
-      accessible_type = g_type_register_static (ATK_TYPE_OBJECT, "GtkAccessible", &accessible_info, 0);
-    }
-
-  return accessible_type;
+static void
+gtk_accessible_init (GtkAccessible *object)
+{
 }
 
 static void
 gtk_accessible_class_init (GtkAccessibleClass *klass)
 {
   klass->connect_widget_destroyed = gtk_accessible_real_connect_widget_destroyed;
-
 }
 
 /**
@@ -84,9 +65,12 @@ gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
 {
   if (accessible->widget)
   {
-    gtk_signal_connect (GTK_OBJECT (accessible->widget),
-                        "destroy",
-                        GTK_SIGNAL_FUNC (gtk_widget_destroyed),
-                        &accessible->widget);
+    g_signal_connect (accessible->widget,
+                      "destroy",
+                      G_CALLBACK (gtk_widget_destroyed),
+                      &accessible->widget);
   }
 }
+
+#define __GTK_ACCESSIBLE_C__
+#include "gtkaliasdef.c"