Fix inter-header includes

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

diff --git a/gtk/a11y/gtkmenushellaccessible.h b/gtk/a11y/gtkmenushellaccessible.h
index 265b74eccb127d41f7d49b2ffd80f75da467af8b..393ce4bb3beabbac81c4947f3082e68343ec3e9c 100644 (file)
--- a/gtk/a11y/gtkmenushellaccessible.h
+++ b/gtk/a11y/gtkmenushellaccessible.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
@@ -12,15 +12,13 @@
  * 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_MENU_SHELL_ACCESSIBLE_H__
 #define __GTK_MENU_SHELL_ACCESSIBLE_H__
 
-#include "gailcontainer.h"
+#include <gtk/a11y/gtkcontaineraccessible.h>
 
 G_BEGIN_DECLS
 
@@ -31,17 +29,20 @@ G_BEGIN_DECLS
 #define GTK_IS_MENU_SHELL_ACCESSIBLE_CLASS(klass)         (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_SHELL_ACCESSIBLE))
 #define GTK_MENU_SHELL_ACCESSIBLE_GET_CLASS(obj)          (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_SHELL_ACCESSIBLE, GtkMenuShellAccessibleClass))
 
-typedef struct _GtkMenuShellAccessible      GtkMenuShellAccessible;
-typedef struct _GtkMenuShellAccessibleClass GtkMenuShellAccessibleClass;
+typedef struct _GtkMenuShellAccessible        GtkMenuShellAccessible;
+typedef struct _GtkMenuShellAccessibleClass   GtkMenuShellAccessibleClass;
+typedef struct _GtkMenuShellAccessiblePrivate GtkMenuShellAccessiblePrivate;
 
 struct _GtkMenuShellAccessible
 {
-  GailContainer parent;
+  GtkContainerAccessible parent;
+
+  GtkMenuShellAccessiblePrivate *priv;
 };
 
 struct _GtkMenuShellAccessibleClass
 {
-  GailContainerClass parent_class;
+  GtkContainerAccessibleClass parent_class;
 };
 
 GType gtk_menu_shell_accessible_get_type (void);