Fix inter-header includes

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

diff --git a/gtk/a11y/gtkwidgetaccessible.h b/gtk/a11y/gtkwidgetaccessible.h
index c88a3fbcdbd2388bd63941a13f97aa5c0bfb6769..003d2fbe5d8e321df72e9ab6cd422fe533516066 100644 (file)
--- a/gtk/a11y/gtkwidgetaccessible.h
+++ b/gtk/a11y/gtkwidgetaccessible.h
@@ -1,4 +1,4 @@
-/* GAIL - The GNOME Accessibility Implementation Library
+/* GTK+ - accessibility implementations
  * Copyright 2001 Sun Microsystems Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -18,26 +18,26 @@
 #ifndef __GTK_WIDGET_ACCESSIBLE_H__
 #define __GTK_WIDGET_ACCESSIBLE_H__
 
-#include "gtk/gtkaccessible.h"
-#include "gtk/gtkwidget.h"
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_WIDGET_ACCESSIBLE                     (_gtk_widget_accessible_get_type ())
+#define GTK_TYPE_WIDGET_ACCESSIBLE                     (gtk_widget_accessible_get_type ())
 #define GTK_WIDGET_ACCESSIBLE(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WIDGET_ACCESSIBLE, GtkWidgetAccessible))
 #define GTK_WIDGET_ACCESSIBLE_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WIDGET_ACCESSIBLE, GtkWidgetAccessibleClass))
 #define GTK_IS_WIDGET_ACCESSIBLE(obj)                  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WIDGET_ACCESSIBLE))
 #define GTK_IS_WIDGET_ACCESSIBLE_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WIDGET_ACCESSIBLE))
 #define GTK_WIDGET_ACCESSIBLE_GET_CLASS(obj)           (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WIDGET_ACCESSIBLE, GtkWidgetAccessibleClass))
 
-typedef struct _GtkWidgetAccessible      GtkWidgetAccessible;
-typedef struct _GtkWidgetAccessibleClass GtkWidgetAccessibleClass;
+typedef struct _GtkWidgetAccessible        GtkWidgetAccessible;
+typedef struct _GtkWidgetAccessibleClass   GtkWidgetAccessibleClass;
+typedef struct _GtkWidgetAccessiblePrivate GtkWidgetAccessiblePrivate;
 
 struct _GtkWidgetAccessible
 {
   GtkAccessible parent;
 
-  AtkLayer layer;
+  GtkWidgetAccessiblePrivate *priv;
 };
 
 struct _GtkWidgetAccessibleClass
@@ -52,7 +52,7 @@ struct _GtkWidgetAccessibleClass
 
 };
 
-GType _gtk_widget_accessible_get_type (void);
+GType gtk_widget_accessible_get_type (void);
 
 G_END_DECLS