[gtk+] a11y: Get rid of gtk.h includes in headers



commit 24b9599af7db2f46646a0471993cf8e816a1aea3
Author: Benjamin Otte <otte redhat com>
Date:   Thu Nov 10 17:03:10 2011 +0100

    a11y: Get rid of gtk.h includes in headers
    
    This way, we can include them without accidentally including deprecated
    code. Which means we can still use the recently added turning-off tricks
    for deprecation warnings.

 gtk/a11y/gtkcontaineraccessible.h   |    1 +
 gtk/a11y/gtkmenuaccessible.c        |    1 +
 gtk/a11y/gtkmenuaccessible.h        |    1 +
 gtk/a11y/gtkscalebuttonaccessible.h |    1 -
 gtk/a11y/gtktreeviewaccessible.h    |    1 -
 gtk/a11y/gtkwidgetaccessible.h      |    3 ++-
 6 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/gtk/a11y/gtkcontaineraccessible.h b/gtk/a11y/gtkcontaineraccessible.h
index 639ff5d..1f21933 100644
--- a/gtk/a11y/gtkcontaineraccessible.h
+++ b/gtk/a11y/gtkcontaineraccessible.h
@@ -20,6 +20,7 @@
 #ifndef __GTK_CONTAINER_ACCESSIBLE_H__
 #define __GTK_CONTAINER_ACCESSIBLE_H__
 
+#include "gtkcontainer.h"
 #include "gtkwidgetaccessible.h"
 
 G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkmenuaccessible.c b/gtk/a11y/gtkmenuaccessible.c
index df30d98..542ce98 100644
--- a/gtk/a11y/gtkmenuaccessible.c
+++ b/gtk/a11y/gtkmenuaccessible.c
@@ -21,6 +21,7 @@
 
 #include "gtkmenuaccessible.h"
 
+#include <gtk/gtk.h>
 
 G_DEFINE_TYPE (GtkMenuAccessible, _gtk_menu_accessible, GTK_TYPE_MENU_SHELL_ACCESSIBLE)
 
diff --git a/gtk/a11y/gtkmenuaccessible.h b/gtk/a11y/gtkmenuaccessible.h
index 59f2946..cb3da49 100644
--- a/gtk/a11y/gtkmenuaccessible.h
+++ b/gtk/a11y/gtkmenuaccessible.h
@@ -20,6 +20,7 @@
 #ifndef __GTK_MENU_ACCESSIBLE_H__
 #define __GTK_MENU_ACCESSIBLE_H__
 
+#include "gtkmenu.h"
 #include "gtkmenushellaccessible.h"
 
 G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkscalebuttonaccessible.h b/gtk/a11y/gtkscalebuttonaccessible.h
index affa380..1e3e4ab 100644
--- a/gtk/a11y/gtkscalebuttonaccessible.h
+++ b/gtk/a11y/gtkscalebuttonaccessible.h
@@ -20,7 +20,6 @@
 #ifndef __GTK_SCALE_BUTTON_ACCESSIBLE_H__
 #define __GTK_SCALE_BUTTON_ACCESSIBLE_H__
 
-#include <gtk/gtk.h>
 #include "gtkbuttonaccessible.h"
 
 G_BEGIN_DECLS
diff --git a/gtk/a11y/gtktreeviewaccessible.h b/gtk/a11y/gtktreeviewaccessible.h
index 5de2619..38b739d 100644
--- a/gtk/a11y/gtktreeviewaccessible.h
+++ b/gtk/a11y/gtktreeviewaccessible.h
@@ -20,7 +20,6 @@
 #ifndef __GTK_TREE_VIEW_ACCESSIBLE_H__
 #define __GTK_TREE_VIEW_ACCESSIBLE_H__
 
-#include <gtk/gtk.h>
 #include "gtkcontaineraccessible.h"
 
 G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkwidgetaccessible.h b/gtk/a11y/gtkwidgetaccessible.h
index 3f9d4ca..cd9009c 100644
--- a/gtk/a11y/gtkwidgetaccessible.h
+++ b/gtk/a11y/gtkwidgetaccessible.h
@@ -20,7 +20,8 @@
 #ifndef __GTK_WIDGET_ACCESSIBLE_H__
 #define __GTK_WIDGET_ACCESSIBLE_H__
 
-#include <gtk/gtk.h>
+#include "gtk/gtkaccessible.h"
+#include "gtk/gtkwidget.h"
 
 G_BEGIN_DECLS
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]