Fix inter-header includes

Since we are going to install these headers soon, we need
to make their mutual includes work in the installed location
as well. Also, avoid including individual gtk headers, to
avoid trouble with single-include guards.
This commit is contained in:
Matthias Clasen 2012-12-27 01:21:11 -05:00
parent d2944ce633
commit 07a00d5939
50 changed files with 54 additions and 55 deletions

View File

@ -18,7 +18,7 @@
#ifndef __GTK_ARROW_ACCESSIBLE_H__
#define __GTK_ARROW_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h"
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS

View File

@ -19,7 +19,7 @@
#define __GTK_BOOLEAN_CELL_ACCESSIBLE_H__
#include <atk/atk.h>
#include "gtkrenderercellaccessible.h"
#include <gtk/a11y/gtkrenderercellaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_BUTTON_ACCESSIBLE_H__
#define __GTK_BUTTON_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS

View File

@ -19,7 +19,7 @@
#define __GTK_CELL_ACCESSIBLE_H__
#include <atk/atk.h>
#include "gtk/gtkaccessible.h"
#include <gtk/gtk.h>
G_BEGIN_DECLS

View File

@ -19,7 +19,7 @@
#define __GTK_CELL_ACCESSIBLE_PARENT_H__
#include <atk/atk.h>
#include "gtkcellaccessible.h"
#include <gtk/a11y/gtkcellaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_CELL_ACCESSIBLE_PRIVATE_H__
#define __GTK_CELL_ACCESSIBLE_PRIVATE_H__
#include "gtkcellaccessible.h"
#include <gtk/a11y/gtkcellaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__
#define __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__
#include "gtkmenuitemaccessible.h"
#include <gtk/a11y/gtkmenuitemaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_COLOR_SWATCH_ACCESSIBLE_H__
#define __GTK_COLOR_SWATCH_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h"
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_COMBO_BOX_ACCESSIBLE_H__
#define __GTK_COMBO_BOX_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS

View File

@ -18,8 +18,8 @@
#ifndef __GTK_CONTAINER_ACCESSIBLE_H__
#define __GTK_CONTAINER_ACCESSIBLE_H__
#include "gtkcontainer.h"
#include "gtkwidgetaccessible.h"
#include <gtk/gtk.h>
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS

View File

@ -19,7 +19,7 @@
#define __GTK_CONTAINER_CELL_ACCESSIBLE_H__
#include <atk/atk.h>
#include "gtkcellaccessible.h"
#include <gtk/a11y/gtkcellaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_ENTRY_ACCESSIBLE_H__
#define __GTK_ENTRY_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h"
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_EXPANDER_ACCESSIBLE_H__
#define __GTK_EXPANDER_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_FRAME_ACCESSIBLE_H__
#define __GTK_FRAME_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS

View File

@ -18,8 +18,8 @@
#ifndef __GTK_ICON_VIEW_ACCESSIBLE_H__
#define __GTK_ICON_VIEW_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include "gtk/gtkiconview.h"
#include <gtk/gtk.h>
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_ICON_VIEW_ACCESSIBLE_PRIVATE_H__
#define __GTK_ICON_VIEW_ACCESSIBLE_PRIVATE_H__
#include "gtkiconviewaccessible.h"
#include <gtk/a11y/gtkiconviewaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_IMAGE_ACCESSIBLE_H__
#define __GTK_IMAGE_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h"
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS

View File

@ -19,7 +19,7 @@
#define __GTK_IMAGE_CELL_ACCESSIBLE_H__
#include <atk/atk.h>
#include "gtkrenderercellaccessible.h"
#include <gtk/a11y/gtkrenderercellaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_LABEL_ACCESSIBLE_H__
#define __GTK_LABEL_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h"
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_LINK_BUTTON_ACCESSIBLE_H__
#define __GTK_LINK_BUTTON_ACCESSIBLE_H__
#include "gtkbuttonaccessible.h"
#include <gtk/a11y/gtkbuttonaccessible.h>
G_BEGIN_DECLS

View File

@ -18,8 +18,8 @@
#ifndef __GTK_LOCK_BUTTON_ACCESSIBLE_H__
#define __GTK_LOCK_BUTTON_ACCESSIBLE_H__
#include "gtkbuttonaccessible.h"
#include "gtk/gtklockbutton.h"
#include <gtk/gtk.h>
#include <gtk/a11y/gtkbuttonaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_LOCK_BUTTON_ACCESSIBLE_PRIVATE_H__
#define __GTK_LOCK_BUTTON_ACCESSIBLE_PRIVATE_H__
#include "gtklockbuttonaccessible.h"
#include <gtk/a11y/gtklockbuttonaccessible.h>
G_BEGIN_DECLS

View File

@ -18,8 +18,8 @@
#ifndef __GTK_MENU_ACCESSIBLE_H__
#define __GTK_MENU_ACCESSIBLE_H__
#include "gtkmenu.h"
#include "gtkmenushellaccessible.h"
#include <gtk/gtk.h>
#include <gtk/a11y/gtkmenushellaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_MENU_ITEM_ACCESSIBLE_H__
#define __GTK_MENU_ITEM_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_MENU_SHELL_ACCESSIBLE_H__
#define __GTK_MENU_SHELL_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_NOTEBOOK_ACCESSIBLE_H__
#define __GTK_NOTEBOOK_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_NOTEBOOK_PAGE_ACCESSIBLE_H__
#define __GTK_NOTEBOOK_PAGE_ACCESSIBLE_H__
#include "gtknotebookaccessible.h"
#include <gtk/a11y/gtknotebookaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_PANED_ACCESSIBLE_H__
#define __GTK_PANED_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_PROGRESS_BAR_ACCESSIBLE_H__
#define __GTK_PROGRESS_BAR_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h"
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_RADIO_BUTTON_ACCESSIBLE_H__
#define __GTK_RADIO_BUTTON_ACCESSIBLE_H__
#include "gtktogglebuttonaccessible.h"
#include <gtk/a11y/gtktogglebuttonaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__
#define __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__
#include "gtkcheckmenuitemaccessible.h"
#include <gtk/a11y/gtkcheckmenuitemaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_RANGE_ACCESSIBLE_H__
#define __GTK_RANGE_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h"
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS

View File

@ -19,7 +19,7 @@
#define __GTK_RENDERER_CELL_ACCESSIBLE_H__
#include <atk/atk.h>
#include "gtkcellaccessible.h"
#include <gtk/a11y/gtkcellaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_SCALE_ACCESSIBLE_H__
#define __GTK_SCALE_ACCESSIBLE_H__
#include "gtkrangeaccessible.h"
#include <gtk/a11y/gtkrangeaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_SCALE_BUTTON_ACCESSIBLE_H__
#define __GTK_SCALE_BUTTON_ACCESSIBLE_H__
#include "gtkbuttonaccessible.h"
#include <gtk/a11y/gtkbuttonaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_SCROLLBAR_ACCESSIBLE_H__
#define __GTK_SCROLLBAR_ACCESSIBLE_H__
#include "gtkrangeaccessible.h"
#include <gtk/a11y/gtkrangeaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_SCROLLED_WINDOW_ACCESSIBLE_H__
#define __GTK_SCROLLED_WINDOW_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_SPIN_BUTTON_ACCESSIBLE_H__
#define __GTK_SPIN_BUTTON_ACCESSIBLE_H__
#include "gtkentryaccessible.h"
#include <gtk/a11y/gtkentryaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_SPINNER_ACCESSIBLE_H__
#define __GTK_SPINNER_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h"
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_STATUSBAR_ACCESSIBLE_H__
#define __GTK_STATUSBAR_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_SWITCH_ACCESSIBLE_H__
#define __GTK_SWITCH_ACCESSIBLE_H__
#include "gtkwidgetaccessible.h"
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS

View File

@ -19,7 +19,7 @@
#define __GTK_TEXT_CELL_ACCESSIBLE_H__
#include <atk/atk.h>
#include "gtkrenderercellaccessible.h"
#include <gtk/a11y/gtkrenderercellaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_TEXT_VIEW_ACCESSIBLE_H__
#define __GTK_TEXT_VIEW_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_TEXT_VIEW_ACCESSIBLE_PRIVATE_H__
#define __GTK_TEXT_VIEW_ACCESSIBLE_PRIVATE_H__
#include "gtktextviewaccessible.h"
#include <gtk/a11y/gtktextviewaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_TOGGLE_BUTTON_ACCESSIBLE_H__
#define __GTK_TOGGLE_BUTTON_ACCESSIBLE_H__
#include "gtkbuttonaccessible.h"
#include <gtk/a11y/gtkbuttonaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_TREE_VIEW_ACCESSIBLE_H__
#define __GTK_TREE_VIEW_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_TREE_VIEW_ACCESSIBLE_PRIVATE_H__
#define __GTK_TREE_VIEW_ACCESSIBLE_PRIVATE_H__
#include "gtktreeviewaccessible.h"
#include <gtk/a11y/gtktreeviewaccessible.h>
G_BEGIN_DECLS

View File

@ -18,8 +18,7 @@
#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

View File

@ -18,7 +18,7 @@
#ifndef __GTK_WIDGET_ACCESSIBLE_PRIVATE_H__
#define __GTK_WIDGET_ACCESSIBLE_PRIVATE_H__
#include "gtkwidgetaccessible.h"
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS

View File

@ -18,7 +18,7 @@
#ifndef __GTK_WINDOW_ACCESSIBLE_H__
#define __GTK_WINDOW_ACCESSIBLE_H__
#include "gtkcontaineraccessible.h"
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS