diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-05-28 15:07:04 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-05-28 15:07:04 +0000 |
| commit | eff99c282cb6967f4b1df2f2b53f2bbb034ce79a (patch) | |
| tree | cd0fc00273e64541176838627e0fbeab2df81023 | |
| parent | e7df0579c298daf1eb3515379fc1fb5a03174ce6 (diff) | |
| download | gdk-pixbuf-eff99c282cb6967f4b1df2f2b53f2bbb034ce79a.tar.gz | |
define __GTK_H_INSIDE__ around including all other headers.
2008-05-28 Michael Natterer <mitch@imendio.com>
* gtk/gtk.h: define __GTK_H_INSIDE__ around including all other
headers.
* gtk/gtktypebuiltins.h.template
* gtk/gtkversion.h.in
* gtk/gtk*.h: add single-include guards that #error out if
GTK_DISABLE_SINGLE_INCLUDES is defined and any of these files is
included individually.
* gtk/gtkprintbackend.h
* gtk/gtkprinter-private.h
* gtk/gtktextlayout.h
* gtk/gtktexttagprivate.h
* gtk/gtktexttypes.h
* gtk/gtktreedatalist.h: include <gtk/gtk.h> instead of individual
headers in these private or semi-private headers.
* gtk/gtkimmodule.h: also here because it's not in gtk.h.
* gtk/gtkpagesetupunixdialog.h
* gtk/gtkprinter.h
* gtk/gtkprintjob.h
* gtk/gtkprintunixdialog.h: likewise in the gtkunixprint headers.
* gtk/gtkclist.h
* gtk/gtkcombo.h
* gtk/gtkctree.h
* gtk/gtkfilesel.h
* gtk/gtkitemfactory.h
* gtk/gtklist.h
* gtk/gtklistitem.h
* gtk/gtkoldeditable.h
* gtk/gtkoptionmenu.h
* gtk/gtkpixmap.h
* gtk/gtkpreview.h
* gtk/gtksignal.h
* gtk/gtktipsquery.h: whenever possible, include only <gtk/gtk.h>
instead of individual headers in these deprecated headers. They
don't get included at all when GTK_DISABLE_DEPRECATED is defined,
so if an app needs them anyway, it must undef GTK_DISABLE_DEPRECATED
and include them individually, which should continue to work.
* gtk/gtkclist.c: include "gtkctree.h" because of the change
above.
svn path=/trunk/; revision=20221
207 files changed, 812 insertions, 69 deletions
@@ -1,3 +1,50 @@ +2008-05-28 Michael Natterer <mitch@imendio.com> + + * gtk/gtk.h: define __GTK_H_INSIDE__ around including all other + headers. + + * gtk/gtktypebuiltins.h.template + * gtk/gtkversion.h.in + * gtk/gtk*.h: add single-include guards that #error out if + GTK_DISABLE_SINGLE_INCLUDES is defined and any of these files is + included individually. + + * gtk/gtkprintbackend.h + * gtk/gtkprinter-private.h + * gtk/gtktextlayout.h + * gtk/gtktexttagprivate.h + * gtk/gtktexttypes.h + * gtk/gtktreedatalist.h: include <gtk/gtk.h> instead of individual + headers in these private or semi-private headers. + + * gtk/gtkimmodule.h: also here because it's not in gtk.h. + + * gtk/gtkpagesetupunixdialog.h + * gtk/gtkprinter.h + * gtk/gtkprintjob.h + * gtk/gtkprintunixdialog.h: likewise in the gtkunixprint headers. + + * gtk/gtkclist.h + * gtk/gtkcombo.h + * gtk/gtkctree.h + * gtk/gtkfilesel.h + * gtk/gtkitemfactory.h + * gtk/gtklist.h + * gtk/gtklistitem.h + * gtk/gtkoldeditable.h + * gtk/gtkoptionmenu.h + * gtk/gtkpixmap.h + * gtk/gtkpreview.h + * gtk/gtksignal.h + * gtk/gtktipsquery.h: whenever possible, include only <gtk/gtk.h> + instead of individual headers in these deprecated headers. They + don't get included at all when GTK_DISABLE_DEPRECATED is defined, + so if an app needs them anyway, it must undef GTK_DISABLE_DEPRECATED + and include them individually, which should continue to work. + + * gtk/gtkclist.c: include "gtkctree.h" because of the change + above. + 2008-05-28 Kristian Rietveld <kris@imendio.com> Bug 449625 - crash in gtk_tree_view_real_move_cursor at @@ -27,6 +27,7 @@ #ifndef __GTK_H__ #define __GTK_H__ +#define __GTK_H_INSIDE__ #include <gdk/gdk.h> #include <gtk/gtkaboutdialog.h> @@ -231,5 +232,6 @@ #include <gtk/gtktipsquery.h> #include <gtk/gtktooltips.h> +#undef __GTK_H_INSIDE__ #endif /* __GTK_H__ */ diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h index b77e658c1..bf471044c 100644 --- a/gtk/gtkaboutdialog.h +++ b/gtk/gtkaboutdialog.h @@ -22,6 +22,10 @@ Author: Anders Carlsson <andersca@codefactory.se> */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ABOUT_DIALOG_H__ #define __GTK_ABOUT_DIALOG_H__ diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h index 7e89ddf98..d5ade0b32 100644 --- a/gtk/gtkaccelgroup.h +++ b/gtk/gtkaccelgroup.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ACCEL_GROUP_H__ #define __GTK_ACCEL_GROUP_H__ diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h index 4eb842a61..d831f553c 100644 --- a/gtk/gtkaccellabel.h +++ b/gtk/gtkaccellabel.h @@ -27,6 +27,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ACCEL_LABEL_H__ #define __GTK_ACCEL_LABEL_H__ diff --git a/gtk/gtkaccelmap.h b/gtk/gtkaccelmap.h index 932c893ab..208704920 100644 --- a/gtk/gtkaccelmap.h +++ b/gtk/gtkaccelmap.h @@ -16,6 +16,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ACCEL_MAP_H__ #define __GTK_ACCEL_MAP_H__ diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h index ca8645be6..6442b2b85 100644 --- a/gtk/gtkaccessible.h +++ b/gtk/gtkaccessible.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ACCESSIBLE_H__ #define __GTK_ACCESSIBLE_H__ diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h index bb1581352..02b77b39f 100644 --- a/gtk/gtkaction.h +++ b/gtk/gtkaction.h @@ -27,6 +27,11 @@ * files for a list of changes. These files are distributed with * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ACTION_H__ #define __GTK_ACTION_H__ diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h index 73e9c43e7..2618e91a1 100644 --- a/gtk/gtkactiongroup.h +++ b/gtk/gtkactiongroup.h @@ -27,6 +27,11 @@ * files for a list of changes. These files are distributed with * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ACTION_GROUP_H__ #define __GTK_ACTION_GROUP_H__ diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h index 1fe3e4ae8..ea37a9a42 100644 --- a/gtk/gtkadjustment.h +++ b/gtk/gtkadjustment.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ADJUSTMENT_H__ #define __GTK_ADJUSTMENT_H__ diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h index df39c5418..5946c74f0 100644 --- a/gtk/gtkalignment.h +++ b/gtk/gtkalignment.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ALIGNMENT_H__ #define __GTK_ALIGNMENT_H__ diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h index 7692b7718..1911749ac 100644 --- a/gtk/gtkarrow.h +++ b/gtk/gtkarrow.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ARROW_H__ #define __GTK_ARROW_H__ diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h index e85888c6e..3de843b47 100644 --- a/gtk/gtkaspectframe.h +++ b/gtk/gtkaspectframe.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ASPECT_FRAME_H__ #define __GTK_ASPECT_FRAME_H__ diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h index cadffd0d5..92d290f62 100644 --- a/gtk/gtkassistant.h +++ b/gtk/gtkassistant.h @@ -23,6 +23,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ASSISTANT_H__ #define __GTK_ASSISTANT_H__ diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h index 1f69197ff..4c4f58b28 100644 --- a/gtk/gtkbbox.h +++ b/gtk/gtkbbox.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_BUTTON_BOX_H__ #define __GTK_BUTTON_BOX_H__ diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h index c919c1d94..4e55bf21c 100644 --- a/gtk/gtkbin.h +++ b/gtk/gtkbin.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_BIN_H__ #define __GTK_BIN_H__ diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h index a3109b298..73615adef 100644 --- a/gtk/gtkbindings.h +++ b/gtk/gtkbindings.h @@ -27,6 +27,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_BINDINGS_H__ #define __GTK_BINDINGS_H__ diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h index b4fec7493..abd6fdbc4 100644 --- a/gtk/gtkbox.h +++ b/gtk/gtkbox.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_BOX_H__ #define __GTK_BOX_H__ diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h index 21fcc6114..73dbcbde0 100644 --- a/gtk/gtkbuildable.h +++ b/gtk/gtkbuildable.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_BUILDABLE_H__ #define __GTK_BUILDABLE_H__ diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h index eb82a61f7..b266bc6bc 100644 --- a/gtk/gtkbuilder.h +++ b/gtk/gtkbuilder.h @@ -17,6 +17,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_BUILDER_H__ #define __GTK_BUILDER_H__ diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h index 3d66e0125..aaac54687 100644 --- a/gtk/gtkbutton.h +++ b/gtk/gtkbutton.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_BUTTON_H__ #define __GTK_BUTTON_H__ diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h index be62f1bc7..707109157 100644 --- a/gtk/gtkcalendar.h +++ b/gtk/gtkcalendar.h @@ -26,6 +26,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CALENDAR_H__ #define __GTK_CALENDAR_H__ diff --git a/gtk/gtkcelleditable.h b/gtk/gtkcelleditable.h index 10cde8e89..74d6949ae 100644 --- a/gtk/gtkcelleditable.h +++ b/gtk/gtkcelleditable.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CELL_EDITABLE_H__ #define __GTK_CELL_EDITABLE_H__ diff --git a/gtk/gtkcelllayout.h b/gtk/gtkcelllayout.h index 3f03687a1..b1e9fb8a8 100644 --- a/gtk/gtkcelllayout.h +++ b/gtk/gtkcelllayout.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CELL_LAYOUT_H__ #define __GTK_CELL_LAYOUT_H__ diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h index d8428623d..06bc5c10a 100644 --- a/gtk/gtkcellrenderer.h +++ b/gtk/gtkcellrenderer.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_H__ #define __GTK_CELL_RENDERER_H__ diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h index d9fd1d110..45c1cf6fc 100644 --- a/gtk/gtkcellrendereraccel.h +++ b/gtk/gtkcellrendereraccel.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_ACCEL_H__ #define __GTK_CELL_RENDERER_ACCEL_H__ diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h index ade6b8a4f..a3981e5f9 100644 --- a/gtk/gtkcellrenderercombo.h +++ b/gtk/gtkcellrenderercombo.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_COMBO_H__ #define __GTK_CELL_RENDERER_COMBO_H__ diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h index b479c9c75..7886f8e3b 100644 --- a/gtk/gtkcellrendererpixbuf.h +++ b/gtk/gtkcellrendererpixbuf.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_PIXBUF_H__ #define __GTK_CELL_RENDERER_PIXBUF_H__ diff --git a/gtk/gtkcellrendererprogress.h b/gtk/gtkcellrendererprogress.h index 6e84cd0e4..4bb4134c4 100644 --- a/gtk/gtkcellrendererprogress.h +++ b/gtk/gtkcellrendererprogress.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_PROGRESS_H__ #define __GTK_CELL_RENDERER_PROGRESS_H__ diff --git a/gtk/gtkcellrendererspin.h b/gtk/gtkcellrendererspin.h index a6f66ad9e..b9f0bb1a6 100644 --- a/gtk/gtkcellrendererspin.h +++ b/gtk/gtkcellrendererspin.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_SPIN_H__ #define __GTK_CELL_RENDERER_SPIN_H__ diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h index fef52adf2..b6df6a084 100644 --- a/gtk/gtkcellrenderertext.h +++ b/gtk/gtkcellrenderertext.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_TEXT_H__ #define __GTK_CELL_RENDERER_TEXT_H__ @@ -98,5 +102,4 @@ void gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRende G_END_DECLS - #endif /* __GTK_CELL_RENDERER_TEXT_H__ */ diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h index 302909bd6..500ea53a7 100644 --- a/gtk/gtkcellrenderertoggle.h +++ b/gtk/gtkcellrenderertoggle.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_TOGGLE_H__ #define __GTK_CELL_RENDERER_TOGGLE_H__ diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h index 6a79c3aba..790fc7fc2 100644 --- a/gtk/gtkcellview.h +++ b/gtk/gtkcellview.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CELL_VIEW_H__ #define __GTK_CELL_VIEW_H__ diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h index 106bf5463..2e0a47f35 100644 --- a/gtk/gtkcheckbutton.h +++ b/gtk/gtkcheckbutton.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CHECK_BUTTON_H__ #define __GTK_CHECK_BUTTON_H__ diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h index 6db552fc6..c8dae31cd 100644 --- a/gtk/gtkcheckmenuitem.h +++ b/gtk/gtkcheckmenuitem.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CHECK_MENU_ITEM_H__ #define __GTK_CHECK_MENU_ITEM_H__ diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h index 1825cf767..5de415279 100644 --- a/gtk/gtkclipboard.h +++ b/gtk/gtkclipboard.h @@ -19,6 +19,10 @@ * Global clipboard abstraction. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CLIPBOARD_H__ #define __GTK_CLIPBOARD_H__ diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 81ac08c3c..58297816c 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -35,6 +35,7 @@ #include "gtkmain.h" #include "gtkobject.h" +#include "gtkctree.h" #include "gtkclist.h" #include "gtkbindings.h" #include "gtkdnd.h" diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h index 030be7206..9744119b7 100644 --- a/gtk/gtkclist.h +++ b/gtk/gtkclist.h @@ -30,15 +30,7 @@ #ifndef __GTK_CLIST_H__ #define __GTK_CLIST_H__ -#include <gdk/gdk.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkalignment.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkhscrollbar.h> -#include <gtk/gtkvscrollbar.h> -#include <gtk/gtkenums.h> - +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h index b6a00fdf4..f9ee40e16 100644 --- a/gtk/gtkcolorbutton.h +++ b/gtk/gtkcolorbutton.h @@ -28,6 +28,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_COLOR_BUTTON_H__ #define __GTK_COLOR_BUTTON_H__ diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h index 8cfc3c931..34a271ce6 100644 --- a/gtk/gtkcolorsel.h +++ b/gtk/gtkcolorsel.h @@ -24,6 +24,11 @@ * files for a list of changes. These files are distributed with * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_COLOR_SELECTION_H__ #define __GTK_COLOR_SELECTION_H__ diff --git a/gtk/gtkcolorseldialog.h b/gtk/gtkcolorseldialog.h index 7ad024911..3b9ad69f6 100644 --- a/gtk/gtkcolorseldialog.h +++ b/gtk/gtkcolorseldialog.h @@ -23,6 +23,11 @@ * files for a list of changes. These files are distributed with * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_COLOR_SELECTION_DIALOG_H__ #define __GTK_COLOR_SELECTION_DIALOG_H__ diff --git a/gtk/gtkcombo.h b/gtk/gtkcombo.h index 31655af3a..c9c8b930c 100644 --- a/gtk/gtkcombo.h +++ b/gtk/gtkcombo.h @@ -29,8 +29,8 @@ #ifndef __GTK_SMART_COMBO_H__ #define __GTK_SMART_COMBO_H__ -#include <gtk/gtkhbox.h> -#include <gtk/gtkitem.h> +#include <gtk/gtk.h> + G_BEGIN_DECLS diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h index 6ab2d9545..cfead42d0 100644 --- a/gtk/gtkcombobox.h +++ b/gtk/gtkcombobox.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_COMBO_BOX_H__ #define __GTK_COMBO_BOX_H__ diff --git a/gtk/gtkcomboboxentry.h b/gtk/gtkcomboboxentry.h index 5fc71d10d..f243fc6a3 100644 --- a/gtk/gtkcomboboxentry.h +++ b/gtk/gtkcomboboxentry.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_COMBO_BOX_ENTRY_H__ #define __GTK_COMBO_BOX_ENTRY_H__ diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h index 612fe8bcb..04ba4f914 100644 --- a/gtk/gtkcontainer.h +++ b/gtk/gtkcontainer.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CONTAINER_H__ #define __GTK_CONTAINER_H__ diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h index a67ee5f9a..5d4ea5f9e 100644 --- a/gtk/gtkctree.h +++ b/gtk/gtkctree.h @@ -33,7 +33,7 @@ #ifndef __GTK_CTREE_H__ #define __GTK_CTREE_H__ -#include <gtk/gtkclist.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtkcurve.h b/gtk/gtkcurve.h index 94c2c59b1..09028fe13 100644 --- a/gtk/gtkcurve.h +++ b/gtk/gtkcurve.h @@ -34,6 +34,10 @@ * distribution. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_CURVE_H__ #define __GTK_CURVE_H__ diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h index 5b148c886..c4d9d55ec 100644 --- a/gtk/gtkdebug.h +++ b/gtk/gtkdebug.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_DEBUG_H__ #define __GTK_DEBUG_H__ diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h index 0b6b65c15..4115f9a85 100644 --- a/gtk/gtkdialog.h +++ b/gtk/gtkdialog.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_DIALOG_H__ #define __GTK_DIALOG_H__ diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h index f9119060b..740a2e459 100644 --- a/gtk/gtkdnd.h +++ b/gtk/gtkdnd.h @@ -25,6 +25,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_DND_H__ #define __GTK_DND_H__ diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h index fd445e16a..61c2a5333 100644 --- a/gtk/gtkdrawingarea.h +++ b/gtk/gtkdrawingarea.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_DRAWING_AREA_H__ #define __GTK_DRAWING_AREA_H__ diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h index 46de8150e..e3cab269e 100644 --- a/gtk/gtkeditable.h +++ b/gtk/gtkeditable.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_EDITABLE_H__ #define __GTK_EDITABLE_H__ diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h index c8c80429d..b08c56e39 100644 --- a/gtk/gtkentry.h +++ b/gtk/gtkentry.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ENTRY_H__ #define __GTK_ENTRY_H__ diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h index 19cacc850..0086ce568 100644 --- a/gtk/gtkentrycompletion.h +++ b/gtk/gtkentrycompletion.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ENTRY_COMPLETION_H__ #define __GTK_ENTRY_COMPLETION_H__ diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h index 4fdc7fd3c..4be6d648b 100644 --- a/gtk/gtkenums.h +++ b/gtk/gtkenums.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ENUMS_H__ #define __GTK_ENUMS_H__ diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h index 3fba8b4b6..b5c7e5473 100644 --- a/gtk/gtkeventbox.h +++ b/gtk/gtkeventbox.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_EVENT_BOX_H__ #define __GTK_EVENT_BOX_H__ diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h index e5bfa4544..97163dc5c 100644 --- a/gtk/gtkexpander.h +++ b/gtk/gtkexpander.h @@ -21,6 +21,10 @@ * Mark McLoughlin <mark@skynet.ie> */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_EXPANDER_H__ #define __GTK_EXPANDER_H__ diff --git a/gtk/gtkfilechooser.h b/gtk/gtkfilechooser.h index 5b233878b..63a7c6f11 100644 --- a/gtk/gtkfilechooser.h +++ b/gtk/gtkfilechooser.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_FILE_CHOOSER_H__ #define __GTK_FILE_CHOOSER_H__ diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h index d2d24deee..761153332 100644 --- a/gtk/gtkfilechooserbutton.h +++ b/gtk/gtkfilechooserbutton.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_FILE_CHOOSER_BUTTON_H__ #define __GTK_FILE_CHOOSER_BUTTON_H__ diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h index 0b410e1a9..f1ed3301c 100644 --- a/gtk/gtkfilechooserdialog.h +++ b/gtk/gtkfilechooserdialog.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_FILE_CHOOSER_DIALOG_H__ #define __GTK_FILE_CHOOSER_DIALOG_H__ diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h index 194acb3be..8de57e675 100644 --- a/gtk/gtkfilechooserwidget.h +++ b/gtk/gtkfilechooserwidget.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_FILE_CHOOSER_WIDGET_H__ #define __GTK_FILE_CHOOSER_WIDGET_H__ diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h index fd074f87e..737ad5857 100644 --- a/gtk/gtkfilefilter.h +++ b/gtk/gtkfilefilter.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_FILE_FILTER_H__ #define __GTK_FILE_FILTER_H__ diff --git a/gtk/gtkfilesel.h b/gtk/gtkfilesel.h index 75f65a16d..882356687 100644 --- a/gtk/gtkfilesel.h +++ b/gtk/gtkfilesel.h @@ -29,9 +29,7 @@ #ifndef __GTK_FILESEL_H__ #define __GTK_FILESEL_H__ - -#include <gdk/gdk.h> -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h index a313568cc..cfe3c5e8a 100644 --- a/gtk/gtkfixed.h +++ b/gtk/gtkfixed.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_FIXED_H__ #define __GTK_FIXED_H__ diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h index 8952569b9..f7bd19fe8 100644 --- a/gtk/gtkfontbutton.h +++ b/gtk/gtkfontbutton.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_FONT_BUTTON_H__ #define __GTK_FONT_BUTTON_H__ diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h index f41339910..846903378 100644 --- a/gtk/gtkfontsel.h +++ b/gtk/gtkfontsel.h @@ -28,6 +28,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_FONTSEL_H__ #define __GTK_FONTSEL_H__ diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h index 85729d13c..dc24cf5c5 100644 --- a/gtk/gtkframe.h +++ b/gtk/gtkframe.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_FRAME_H__ #define __GTK_FRAME_H__ diff --git a/gtk/gtkgamma.h b/gtk/gtkgamma.h index fa6999b37..328b6f934 100644 --- a/gtk/gtkgamma.h +++ b/gtk/gtkgamma.h @@ -34,6 +34,10 @@ * distribution. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_GAMMA_CURVE_H__ #define __GTK_GAMMA_CURVE_H__ diff --git a/gtk/gtkgc.h b/gtk/gtkgc.h index 38d70a6bb..4d5f6ffb0 100644 --- a/gtk/gtkgc.h +++ b/gtk/gtkgc.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_GC_H__ #define __GTK_GC_H__ diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h index c690a04b1..8409f44f0 100644 --- a/gtk/gtkhandlebox.h +++ b/gtk/gtkhandlebox.h @@ -29,6 +29,9 @@ * their parents. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif #ifndef __GTK_HANDLE_BOX_H__ #define __GTK_HANDLE_BOX_H__ diff --git a/gtk/gtkhbbox.h b/gtk/gtkhbbox.h index 7423a7547..04bf6c753 100644 --- a/gtk/gtkhbbox.h +++ b/gtk/gtkhbbox.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_HBUTTON_BOX_H__ #define __GTK_HBUTTON_BOX_H__ diff --git a/gtk/gtkhbox.h b/gtk/gtkhbox.h index 5296e21e3..41a5dff8a 100644 --- a/gtk/gtkhbox.h +++ b/gtk/gtkhbox.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_HBOX_H__ #define __GTK_HBOX_H__ diff --git a/gtk/gtkhpaned.h b/gtk/gtkhpaned.h index 2272dfd4a..54fdcdb3d 100644 --- a/gtk/gtkhpaned.h +++ b/gtk/gtkhpaned.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_HPANED_H__ #define __GTK_HPANED_H__ diff --git a/gtk/gtkhruler.h b/gtk/gtkhruler.h index 375b80864..b13867c3b 100644 --- a/gtk/gtkhruler.h +++ b/gtk/gtkhruler.h @@ -34,6 +34,10 @@ * distribution. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_HRULER_H__ #define __GTK_HRULER_H__ diff --git a/gtk/gtkhscale.h b/gtk/gtkhscale.h index 6f4109077..d2e243d9f 100644 --- a/gtk/gtkhscale.h +++ b/gtk/gtkhscale.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_HSCALE_H__ #define __GTK_HSCALE_H__ diff --git a/gtk/gtkhscrollbar.h b/gtk/gtkhscrollbar.h index a6f595ba9..3aff419e9 100644 --- a/gtk/gtkhscrollbar.h +++ b/gtk/gtkhscrollbar.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_HSCROLLBAR_H__ #define __GTK_HSCROLLBAR_H__ diff --git a/gtk/gtkhseparator.h b/gtk/gtkhseparator.h index 008a2fe40..2f3abefa6 100644 --- a/gtk/gtkhseparator.h +++ b/gtk/gtkhseparator.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_HSEPARATOR_H__ #define __GTK_HSEPARATOR_H__ diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h index 1bcbcb40d..381ac7e6c 100644 --- a/gtk/gtkiconfactory.h +++ b/gtk/gtkiconfactory.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ICON_FACTORY_H__ #define __GTK_ICON_FACTORY_H__ diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h index f1c20a23e..015000dc5 100644 --- a/gtk/gtkicontheme.h +++ b/gtk/gtkicontheme.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ICON_THEME_H__ #define __GTK_ICON_THEME_H__ diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h index 66acd5fdd..68d8628f8 100644 --- a/gtk/gtkiconview.h +++ b/gtk/gtkiconview.h @@ -16,6 +16,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ICON_VIEW_H__ #define __GTK_ICON_VIEW_H__ diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index e1b061cca..695d39f08 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_IMAGE_H__ #define __GTK_IMAGE_H__ diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h index f70df311a..0485657e6 100644 --- a/gtk/gtkimagemenuitem.h +++ b/gtk/gtkimagemenuitem.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_IMAGE_MENU_ITEM_H__ #define __GTK_IMAGE_MENU_ITEM_H__ diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h index 47063c03e..b1f3575ad 100644 --- a/gtk/gtkimcontext.h +++ b/gtk/gtkimcontext.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_IM_CONTEXT_H__ #define __GTK_IM_CONTEXT_H__ diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h index 1378c43d1..fb0eadf91 100644 --- a/gtk/gtkimcontextsimple.h +++ b/gtk/gtkimcontextsimple.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_IM_CONTEXT_SIMPLE_H__ #define __GTK_IM_CONTEXT_SIMPLE_H__ diff --git a/gtk/gtkimmodule.h b/gtk/gtkimmodule.h index 353d53292..794b36fcf 100644 --- a/gtk/gtkimmodule.h +++ b/gtk/gtkimmodule.h @@ -20,7 +20,7 @@ #ifndef __GTK_IM_MODULE_H__ #define __GTK_IM_MODULE_H__ -#include <gtk/gtkimcontext.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h index aa410f172..635a24ece 100644 --- a/gtk/gtkimmulticontext.h +++ b/gtk/gtkimmulticontext.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_IM_MULTICONTEXT_H__ #define __GTK_IM_MULTICONTEXT_H__ diff --git a/gtk/gtkinputdialog.h b/gtk/gtkinputdialog.h index 1a1a64899..f24d75514 100644 --- a/gtk/gtkinputdialog.h +++ b/gtk/gtkinputdialog.h @@ -34,6 +34,10 @@ * distribution. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_INPUTDIALOG_H__ #define __GTK_INPUTDIALOG_H__ diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h index ad0ad4c23..be12be0a6 100644 --- a/gtk/gtkinvisible.h +++ b/gtk/gtkinvisible.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_INVISIBLE_H__ #define __GTK_INVISIBLE_H__ diff --git a/gtk/gtkitem.h b/gtk/gtkitem.h index 01ca95c19..1f78b26d3 100644 --- a/gtk/gtkitem.h +++ b/gtk/gtkitem.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_ITEM_H__ #define __GTK_ITEM_H__ diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h index 009992f12..d78483f1d 100644 --- a/gtk/gtkitemfactory.h +++ b/gtk/gtkitemfactory.h @@ -32,8 +32,8 @@ #ifndef __GTK_ITEM_FACTORY_H__ #define __GTK_ITEM_FACTORY_H__ +#include <gtk/gtk.h> -#include <gtk/gtkwidget.h> G_BEGIN_DECLS diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index 5656ebbf8..5d0d12473 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -23,6 +23,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_LABEL_H__ #define __GTK_LABEL_H__ diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h index ffd8b45da..a38ade255 100644 --- a/gtk/gtklayout.h +++ b/gtk/gtklayout.h @@ -28,6 +28,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_LAYOUT_H__ #define __GTK_LAYOUT_H__ diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h index 24e79b460..be3328de8 100644 --- a/gtk/gtklinkbutton.h +++ b/gtk/gtklinkbutton.h @@ -22,6 +22,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Cambridge, MA 02139, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_LINK_BUTTON_H__ #define __GTK_LINK_BUTTON_H__ diff --git a/gtk/gtklist.h b/gtk/gtklist.h index 4023f2e74..08154859b 100644 --- a/gtk/gtklist.h +++ b/gtk/gtklist.h @@ -29,11 +29,7 @@ #ifndef __GTK_LIST_H__ #define __GTK_LIST_H__ - -#include <gdk/gdk.h> -#include <gtk/gtkenums.h> -#include <gtk/gtkcontainer.h> -#include <gtk/gtklistitem.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtklistitem.h b/gtk/gtklistitem.h index 9738bce41..545765d04 100644 --- a/gtk/gtklistitem.h +++ b/gtk/gtklistitem.h @@ -29,9 +29,7 @@ #ifndef __GTK_LIST_ITEM_H__ #define __GTK_LIST_ITEM_H__ - -#include <gdk/gdk.h> -#include <gtk/gtkitem.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h index 9aeb81b3c..8e3ece76a 100644 --- a/gtk/gtkliststore.h +++ b/gtk/gtkliststore.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_LIST_STORE_H__ #define __GTK_LIST_STORE_H__ diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h index 15d08cbe3..6356624c1 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_MAIN_H__ #define __GTK_MAIN_H__ diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h index ba4c8013d..1bea24195 100644 --- a/gtk/gtkmenu.h +++ b/gtk/gtkmenu.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_MENU_H__ #define __GTK_MENU_H__ diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h index 53fba835f..2c3810c16 100644 --- a/gtk/gtkmenubar.h +++ b/gtk/gtkmenubar.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_MENU_BAR_H__ #define __GTK_MENU_BAR_H__ diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h index 4da800edb..bda03f296 100644 --- a/gtk/gtkmenuitem.h +++ b/gtk/gtkmenuitem.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_MENU_ITEM_H__ #define __GTK_MENU_ITEM_H__ diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h index 2595a74ff..742788293 100644 --- a/gtk/gtkmenushell.h +++ b/gtk/gtkmenushell.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_MENU_SHELL_H__ #define __GTK_MENU_SHELL_H__ diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h index 4eb860e31..8c8f046f1 100644 --- a/gtk/gtkmenutoolbutton.h +++ b/gtk/gtkmenutoolbutton.h @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_MENU_TOOL_BUTTON_H__ #define __GTK_MENU_TOOL_BUTTON_H__ diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h index dbf17d2bd..48f428ff3 100644 --- a/gtk/gtkmessagedialog.h +++ b/gtk/gtkmessagedialog.h @@ -1,4 +1,3 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */ /* GTK - The GIMP Toolkit * Copyright (C) 2000 Red Hat, Inc. * @@ -25,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_MESSAGE_DIALOG_H__ #define __GTK_MESSAGE_DIALOG_H__ diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h index 3bc638ae9..20a53786f 100644 --- a/gtk/gtkmisc.h +++ b/gtk/gtkmisc.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_MISC_H__ #define __GTK_MISC_H__ diff --git a/gtk/gtkmodules.h b/gtk/gtkmodules.h index bd157f79a..2ea4d8b4b 100644 --- a/gtk/gtkmodules.h +++ b/gtk/gtkmodules.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_MODULES_H__ #define __GTK_MODULES_H__ diff --git a/gtk/gtkmountoperation.h b/gtk/gtkmountoperation.h index 929972653..7d93e6577 100644 --- a/gtk/gtkmountoperation.h +++ b/gtk/gtkmountoperation.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_MOUNT_OPERATION_H__ #define __GTK_MOUNT_OPERATION_H__ diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h index 887704a22..489918a71 100644 --- a/gtk/gtknotebook.h +++ b/gtk/gtknotebook.h @@ -25,6 +25,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_NOTEBOOK_H__ #define __GTK_NOTEBOOK_H__ diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h index 22d4bf4b2..64b1ee781 100644 --- a/gtk/gtkobject.h +++ b/gtk/gtkobject.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_OBJECT_H__ #define __GTK_OBJECT_H__ diff --git a/gtk/gtkoldeditable.h b/gtk/gtkoldeditable.h index da6d90c36..50fa9ea5c 100644 --- a/gtk/gtkoldeditable.h +++ b/gtk/gtkoldeditable.h @@ -29,10 +29,8 @@ #ifndef __GTK_OLD_EDITABLE_H__ #define __GTK_OLD_EDITABLE_H__ +#include <gtk/gtk.h> -#include <gdk/gdk.h> -#include <gtk/gtkeditable.h> -#include <gtk/gtkwidget.h> G_BEGIN_DECLS diff --git a/gtk/gtkoptionmenu.h b/gtk/gtkoptionmenu.h index 32f6de9f0..8521020ed 100644 --- a/gtk/gtkoptionmenu.h +++ b/gtk/gtkoptionmenu.h @@ -29,9 +29,7 @@ #ifndef __GTK_OPTION_MENU_H__ #define __GTK_OPTION_MENU_H__ - -#include <gdk/gdk.h> -#include <gtk/gtkbutton.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h index e73908195..c96c70197 100644 --- a/gtk/gtkpagesetup.h +++ b/gtk/gtkpagesetup.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_PAGE_SETUP_H__ #define __GTK_PAGE_SETUP_H__ diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/gtkpagesetupunixdialog.h index a99a07d6e..949357201 100644 --- a/gtk/gtkpagesetupunixdialog.h +++ b/gtk/gtkpagesetupunixdialog.h @@ -16,12 +16,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GTK_PAGE_SETUP_UNIX_DIALOG_H__ #define __GTK_PAGE_SETUP_UNIX_DIALOG_H__ -#include <gtk/gtkdialog.h> -#include <gtk/gtkpagesetup.h> -#include <gtk/gtkprintsettings.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h index 003316aef..dd40220f8 100644 --- a/gtk/gtkpaned.h +++ b/gtk/gtkpaned.h @@ -25,6 +25,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_PANED_H__ #define __GTK_PANED_H__ diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h index 65aed126f..24aae9317 100644 --- a/gtk/gtkpapersize.h +++ b/gtk/gtkpapersize.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_PAPER_SIZE_H__ #define __GTK_PAPER_SIZE_H__ diff --git a/gtk/gtkpixmap.h b/gtk/gtkpixmap.h index 1bb4f8543..747a04d95 100644 --- a/gtk/gtkpixmap.h +++ b/gtk/gtkpixmap.h @@ -29,9 +29,7 @@ #ifndef __GTK_PIXMAP_H__ #define __GTK_PIXMAP_H__ - -#include <gdk/gdk.h> -#include <gtk/gtkmisc.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h index 87fe6f92f..bb4302c65 100644 --- a/gtk/gtkplug.h +++ b/gtk/gtkplug.h @@ -23,6 +23,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_PLUG_H__ #define __GTK_PLUG_H__ diff --git a/gtk/gtkpreview.h b/gtk/gtkpreview.h index a13617e49..e4b211d71 100644 --- a/gtk/gtkpreview.h +++ b/gtk/gtkpreview.h @@ -29,8 +29,7 @@ #ifndef __GTK_PREVIEW_H__ #define __GTK_PREVIEW_H__ - -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h index 81c549844..45afe7b05 100644 --- a/gtk/gtkprintbackend.h +++ b/gtk/gtkprintbackend.h @@ -29,10 +29,9 @@ #error "GtkPrintBackend is not supported API for general use" #endif -#include <glib-object.h> #include <cairo.h> +#include <gtk/gtk.h> -#include "gtkprintsettings.h" #include "gtkprinteroptionset.h" #include "gtkprintjob.h" diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h index f754ecdd1..6350a3ca9 100644 --- a/gtk/gtkprintcontext.h +++ b/gtk/gtkprintcontext.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_PRINT_CONTEXT_H__ #define __GTK_PRINT_CONTEXT_H__ diff --git a/gtk/gtkprinter-private.h b/gtk/gtkprinter-private.h index 26146a10a..c5faece1b 100644 --- a/gtk/gtkprinter-private.h +++ b/gtk/gtkprinter-private.h @@ -21,11 +21,9 @@ #ifndef __GTK_PRINTER_PRIVATE_H__ #define __GTK_PRINTER_PRIVATE_H__ -#include <glib.h> +#include <gtk/gtk.h> #include "gtkprinter.h" -#include "gtkprintoperation.h" #include "gtkprinteroptionset.h" -#include "gtkpagesetup.h" #include "gtkprintjob.h" G_BEGIN_DECLS diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h index 1152f88f6..7379c6b3f 100644 --- a/gtk/gtkprinter.h +++ b/gtk/gtkprinter.h @@ -16,13 +16,12 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GTK_PRINTER_H__ #define __GTK_PRINTER_H__ -#include <glib-object.h> #include <cairo.h> -#include <gtk/gtkprintsettings.h> -#include <gtk/gtkpagesetup.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h index 89a3d5bc4..bf192a5f7 100644 --- a/gtk/gtkprintjob.h +++ b/gtk/gtkprintjob.h @@ -16,14 +16,14 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GTK_PRINT_JOB_H__ #define __GTK_PRINT_JOB_H__ -#include <glib-object.h> #include <cairo.h> +#include <gtk/gtk.h> #include <gtk/gtkprinter.h> -#include <gtk/gtkprintoperation.h> G_BEGIN_DECLS diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h index d0d3a3864..a1e24726e 100644 --- a/gtk/gtkprintoperation.h +++ b/gtk/gtkprintoperation.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_PRINT_OPERATION_H__ #define __GTK_PRINT_OPERATION_H__ diff --git a/gtk/gtkprintoperationpreview.h b/gtk/gtkprintoperationpreview.h index d2922bf93..603dea39c 100644 --- a/gtk/gtkprintoperationpreview.h +++ b/gtk/gtkprintoperationpreview.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_PRINT_OPERATION_PREVIEW_H__ #define __GTK_PRINT_OPERATION_PREVIEW_H__ diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h index 09ba0b466..f41bf5cb3 100644 --- a/gtk/gtkprintsettings.h +++ b/gtk/gtkprintsettings.h @@ -17,6 +17,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_PRINT_SETTINGS_H__ #define __GTK_PRINT_SETTINGS_H__ diff --git a/gtk/gtkprintunixdialog.h b/gtk/gtkprintunixdialog.h index b6ad921a4..d4fd6a2d5 100644 --- a/gtk/gtkprintunixdialog.h +++ b/gtk/gtkprintunixdialog.h @@ -16,14 +16,13 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __GTK_PRINT_UNIX_DIALOG_H__ #define __GTK_PRINT_UNIX_DIALOG_H__ -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <gtk/gtkprinter.h> #include <gtk/gtkprintjob.h> -#include <gtk/gtkprintsettings.h> -#include <gtk/gtkpagesetup.h> G_BEGIN_DECLS diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h index 1e5561647..6a374ae11 100644 --- a/gtk/gtkprogressbar.h +++ b/gtk/gtkprogressbar.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_PROGRESS_BAR_H__ #define __GTK_PROGRESS_BAR_H__ diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h index d39648b45..89692851a 100644 --- a/gtk/gtkradioaction.h +++ b/gtk/gtkradioaction.h @@ -27,6 +27,11 @@ * files for a list of changes. These files are distributed with * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RADIO_ACTION_H__ #define __GTK_RADIO_ACTION_H__ diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h index 0d885e63a..378f8c9c3 100644 --- a/gtk/gtkradiobutton.h +++ b/gtk/gtkradiobutton.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RADIO_BUTTON_H__ #define __GTK_RADIO_BUTTON_H__ diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h index 2adb5636d..b5095ec6d 100644 --- a/gtk/gtkradiomenuitem.h +++ b/gtk/gtkradiomenuitem.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RADIO_MENU_ITEM_H__ #define __GTK_RADIO_MENU_ITEM_H__ diff --git a/gtk/gtkradiotoolbutton.h b/gtk/gtkradiotoolbutton.h index febdcf777..32d0e7b6a 100644 --- a/gtk/gtkradiotoolbutton.h +++ b/gtk/gtkradiotoolbutton.h @@ -20,6 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RADIO_TOOL_BUTTON_H__ #define __GTK_RADIO_TOOL_BUTTON_H__ diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h index 7ebb9df67..efdff7853 100644 --- a/gtk/gtkrange.h +++ b/gtk/gtkrange.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RANGE_H__ #define __GTK_RANGE_H__ diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h index c6880af27..d3b3b9974 100644 --- a/gtk/gtkrc.h +++ b/gtk/gtkrc.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RC_H__ #define __GTK_RC_H__ diff --git a/gtk/gtkrecentaction.h b/gtk/gtkrecentaction.h index 776f94265..a2a41b0a3 100644 --- a/gtk/gtkrecentaction.h +++ b/gtk/gtkrecentaction.h @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RECENT_ACTION_H__ #define __GTK_RECENT_ACTION_H__ diff --git a/gtk/gtkrecentchooser.h b/gtk/gtkrecentchooser.h index 738a9b676..a30b78f69 100644 --- a/gtk/gtkrecentchooser.h +++ b/gtk/gtkrecentchooser.h @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RECENT_CHOOSER_H__ #define __GTK_RECENT_CHOOSER_H__ diff --git a/gtk/gtkrecentchooserdialog.h b/gtk/gtkrecentchooserdialog.h index 22be218d0..e522de35b 100644 --- a/gtk/gtkrecentchooserdialog.h +++ b/gtk/gtkrecentchooserdialog.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RECENT_CHOOSER_DIALOG_H__ #define __GTK_RECENT_CHOOSER_DIALOG_H__ diff --git a/gtk/gtkrecentchoosermenu.h b/gtk/gtkrecentchoosermenu.h index 200233f9e..5438ed479 100644 --- a/gtk/gtkrecentchoosermenu.h +++ b/gtk/gtkrecentchoosermenu.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RECENT_CHOOSER_MENU_H__ #define __GTK_RECENT_CHOOSER_MENU_H__ diff --git a/gtk/gtkrecentchooserwidget.h b/gtk/gtkrecentchooserwidget.h index 96aea95f1..04be3e502 100644 --- a/gtk/gtkrecentchooserwidget.h +++ b/gtk/gtkrecentchooserwidget.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RECENT_CHOOSER_WIDGET_H__ #define __GTK_RECENT_CHOOSER_WIDGET_H__ diff --git a/gtk/gtkrecentfilter.h b/gtk/gtkrecentfilter.h index 28f6fe7aa..3f868e404 100644 --- a/gtk/gtkrecentfilter.h +++ b/gtk/gtkrecentfilter.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RECENT_FILTER_H__ #define __GTK_RECENT_FILTER_H__ diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h index 11aeda88a..5b8977440 100644 --- a/gtk/gtkrecentmanager.h +++ b/gtk/gtkrecentmanager.h @@ -18,6 +18,10 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RECENT_MANAGER_H__ #define __GTK_RECENT_MANAGER_H__ diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h index 7b8fe529e..efb30c631 100644 --- a/gtk/gtkruler.h +++ b/gtk/gtkruler.h @@ -34,6 +34,10 @@ * distribution. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_RULER_H__ #define __GTK_RULER_H__ diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h index b249c290f..f61d42c1c 100644 --- a/gtk/gtkscale.h +++ b/gtk/gtkscale.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_SCALE_H__ #define __GTK_SCALE_H__ diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h index 19ca71eec..a8ea99319 100644 --- a/gtk/gtkscalebutton.h +++ b/gtk/gtkscalebutton.h @@ -33,6 +33,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_SCALE_BUTTON_H__ #define __GTK_SCALE_BUTTON_H__ diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h index 2fb94e86f..2c7b3f7a9 100644 --- a/gtk/gtkscrollbar.h +++ b/gtk/gtkscrollbar.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_SCROLLBAR_H__ #define __GTK_SCROLLBAR_H__ diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h index c9668f375..6a3831e90 100644 --- a/gtk/gtkscrolledwindow.h +++ b/gtk/gtkscrolledwindow.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_SCROLLED_WINDOW_H__ #define __GTK_SCROLLED_WINDOW_H__ diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h index 9e97ae2a6..6fe4dd7ca 100644 --- a/gtk/gtkselection.h +++ b/gtk/gtkselection.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_SELECTION_H__ #define __GTK_SELECTION_H__ diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h index 5ea356443..24af13fa0 100644 --- a/gtk/gtkseparator.h +++ b/gtk/gtkseparator.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_SEPARATOR_H__ #define __GTK_SEPARATOR_H__ diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h index fe4f96bf8..2bf61ab68 100644 --- a/gtk/gtkseparatormenuitem.h +++ b/gtk/gtkseparatormenuitem.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_SEPARATOR_MENU_ITEM_H__ #define __GTK_SEPARATOR_MENU_ITEM_H__ diff --git a/gtk/gtkseparatortoolitem.h b/gtk/gtkseparatortoolitem.h index 55e404be6..6f7788b5a 100644 --- a/gtk/gtkseparatortoolitem.h +++ b/gtk/gtkseparatortoolitem.h @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_SEPARATOR_TOOL_ITEM_H__ #define __GTK_SEPARATOR_TOOL_ITEM_H__ diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h index f058e00a6..ffab06c31 100644 --- a/gtk/gtksettings.h +++ b/gtk/gtksettings.h @@ -15,6 +15,11 @@ * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_SETTINGS_H__ #define __GTK_SETTINGS_H__ diff --git a/gtk/gtkshow.h b/gtk/gtkshow.h index 02e25f686..5d83d6864 100644 --- a/gtk/gtkshow.h +++ b/gtk/gtkshow.h @@ -20,6 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_SHOW_H__ #define __GTK_SHOW_H__ diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h index 8f33207e6..79e42e8a0 100644 --- a/gtk/gtksignal.h +++ b/gtk/gtksignal.h @@ -29,9 +29,7 @@ #ifndef __GTK_SIGNAL_H__ #define __GTK_SIGNAL_H__ -#include <gtk/gtkenums.h> -#include <gtk/gtkobject.h> -#include <gtk/gtkmarshal.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h index 4a8315381..404fe2084 100644 --- a/gtk/gtksizegroup.h +++ b/gtk/gtksizegroup.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_SIZE_GROUP_H__ #define __GTK_SIZE_GROUP_H__ diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h index c522e5ba0..04c977eea 100644 --- a/gtk/gtksocket.h +++ b/gtk/gtksocket.h @@ -23,6 +23,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_SOCKET_H__ #define __GTK_SOCKET_H__ diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h index 4bf3570c2..cef9a53a4 100644 --- a/gtk/gtkspinbutton.h +++ b/gtk/gtkspinbutton.h @@ -27,6 +27,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_SPIN_BUTTON_H__ #define __GTK_SPIN_BUTTON_H__ diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h index 470253313..9f419ca8c 100644 --- a/gtk/gtkstatusbar.h +++ b/gtk/gtkstatusbar.h @@ -25,6 +25,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_STATUSBAR_H__ #define __GTK_STATUSBAR_H__ diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h index e58eb6adb..d372509a3 100755 --- a/gtk/gtkstatusicon.h +++ b/gtk/gtkstatusicon.h @@ -21,6 +21,10 @@ * Mark McLoughlin <mark@skynet.ie> */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_STATUS_ICON_H__ #define __GTK_STATUS_ICON_H__ diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h index 5a7408b5c..f250a0c40 100644 --- a/gtk/gtkstock.h +++ b/gtk/gtkstock.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_STOCK_H__ #define __GTK_STOCK_H__ diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h index 0b95f8c0f..e9b900890 100644 --- a/gtk/gtkstyle.h +++ b/gtk/gtkstyle.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_STYLE_H__ #define __GTK_STYLE_H__ diff --git a/gtk/gtktable.h b/gtk/gtktable.h index f925d330d..a7cd31d47 100644 --- a/gtk/gtktable.h +++ b/gtk/gtktable.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TABLE_H__ #define __GTK_TABLE_H__ diff --git a/gtk/gtktearoffmenuitem.h b/gtk/gtktearoffmenuitem.h index cd744b0d4..88d28da27 100644 --- a/gtk/gtktearoffmenuitem.h +++ b/gtk/gtktearoffmenuitem.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TEAROFF_MENU_ITEM_H__ #define __GTK_TEAROFF_MENU_ITEM_H__ diff --git a/gtk/gtktestutils.h b/gtk/gtktestutils.h index 59aa2af4e..f0950de2f 100644 --- a/gtk/gtktestutils.h +++ b/gtk/gtktestutils.h @@ -17,6 +17,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TEST_UTILS_H__ #define __GTK_TEST_UTILS_H__ diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h index 9a0eb9d28..34d2918ab 100644 --- a/gtk/gtktextbuffer.h +++ b/gtk/gtktextbuffer.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TEXT_BUFFER_H__ #define __GTK_TEXT_BUFFER_H__ diff --git a/gtk/gtktextbufferrichtext.h b/gtk/gtktextbufferrichtext.h index 96fc3c969..bbbf6e2b0 100644 --- a/gtk/gtktextbufferrichtext.h +++ b/gtk/gtktextbufferrichtext.h @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TEXT_BUFFER_RICH_TEXT_H__ #define __GTK_TEXT_BUFFER_RICH_TEXT_H__ diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h index 19c3ad9a3..71dad60b4 100644 --- a/gtk/gtktextchild.h +++ b/gtk/gtktextchild.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TEXT_CHILD_H__ #define __GTK_TEXT_CHILD_H__ diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h index f788397f5..44ba8721e 100644 --- a/gtk/gtktextiter.h +++ b/gtk/gtktextiter.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TEXT_ITER_H__ #define __GTK_TEXT_ITER_H__ diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h index cb3578645..a2e8aa3a5 100644 --- a/gtk/gtktextlayout.h +++ b/gtk/gtktextlayout.h @@ -89,8 +89,7 @@ #error "You are not supposed to be including this file; the equivalent public API is in gtktextview.h" #endif -#include <gtk/gtktextbuffer.h> -#include <gtk/gtktextiter.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h index 41bcb9492..7eb80f059 100644 --- a/gtk/gtktextmark.h +++ b/gtk/gtktextmark.h @@ -47,6 +47,10 @@ * */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TEXT_MARK_H__ #define __GTK_TEXT_MARK_H__ diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h index 61d60d9af..4123768a4 100644 --- a/gtk/gtktexttag.h +++ b/gtk/gtktexttag.h @@ -47,6 +47,10 @@ * */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TEXT_TAG_H__ #define __GTK_TEXT_TAG_H__ diff --git a/gtk/gtktexttagprivate.h b/gtk/gtktexttagprivate.h index a7547005a..b3363d925 100644 --- a/gtk/gtktexttagprivate.h +++ b/gtk/gtktexttagprivate.h @@ -27,7 +27,7 @@ #ifndef __GTK_TEXT_TAG_PRIVATE_H__ #define __GTK_TEXT_TAG_PRIVATE_H__ -#include <gtk/gtktexttag.h> +#include <gtk/gtk.h> typedef struct _GtkTextBTreeNode GtkTextBTreeNode; diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h index 6582c7ec0..fe780dcdd 100644 --- a/gtk/gtktexttagtable.h +++ b/gtk/gtktexttagtable.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TEXT_TAG_TABLE_H__ #define __GTK_TEXT_TAG_TABLE_H__ diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h index 3324ec9ed..c624aeaf3 100644 --- a/gtk/gtktexttypes.h +++ b/gtk/gtktexttypes.h @@ -27,9 +27,7 @@ #ifndef __GTK_TEXT_TYPES_H__ #define __GTK_TEXT_TYPES_H__ -#include <glib.h> - -#include <gtk/gtktextbuffer.h> +#include <gtk/gtk.h> #include <gtk/gtktexttagprivate.h> G_BEGIN_DECLS diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h index d5223118e..d7089da95 100644 --- a/gtk/gtktextview.h +++ b/gtk/gtktextview.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TEXT_VIEW_H__ #define __GTK_TEXT_VIEW_H__ diff --git a/gtk/gtktipsquery.h b/gtk/gtktipsquery.h index 2a09baed1..824480ce5 100644 --- a/gtk/gtktipsquery.h +++ b/gtk/gtktipsquery.h @@ -32,8 +32,7 @@ #ifndef __GTK_TIPS_QUERY_H__ #define __GTK_TIPS_QUERY_H__ - -#include <gtk/gtklabel.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/gtk/gtktoggleaction.h b/gtk/gtktoggleaction.h index 6325c35ba..369eba84d 100644 --- a/gtk/gtktoggleaction.h +++ b/gtk/gtktoggleaction.h @@ -27,6 +27,11 @@ * files for a list of changes. These files are distributed with * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TOGGLE_ACTION_H__ #define __GTK_TOGGLE_ACTION_H__ diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h index c5bb68e3e..433ba92c4 100644 --- a/gtk/gtktogglebutton.h +++ b/gtk/gtktogglebutton.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TOGGLE_BUTTON_H__ #define __GTK_TOGGLE_BUTTON_H__ diff --git a/gtk/gtktoggletoolbutton.h b/gtk/gtktoggletoolbutton.h index 1d747d5a1..cc0c85693 100644 --- a/gtk/gtktoggletoolbutton.h +++ b/gtk/gtktoggletoolbutton.h @@ -20,6 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TOGGLE_TOOL_BUTTON_H__ #define __GTK_TOGGLE_TOOL_BUTTON_H__ diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index a1172f8dd..3ce3b827d 100644 --- a/gtk/gtktoolbar.h +++ b/gtk/gtktoolbar.h @@ -29,6 +29,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TOOLBAR_H__ #define __GTK_TOOLBAR_H__ diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h index b7329a02f..6b031d63b 100644 --- a/gtk/gtktoolbutton.h +++ b/gtk/gtktoolbutton.h @@ -20,6 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TOOL_BUTTON_H__ #define __GTK_TOOL_BUTTON_H__ diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h index 430c16d40..865d02d30 100644 --- a/gtk/gtktoolitem.h +++ b/gtk/gtktoolitem.h @@ -20,6 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TOOL_ITEM_H__ #define __GTK_TOOL_ITEM_H__ diff --git a/gtk/gtktoolshell.h b/gtk/gtktoolshell.h index 684ad897a..87bb647ce 100644 --- a/gtk/gtktoolshell.h +++ b/gtk/gtktoolshell.h @@ -20,6 +20,10 @@ * Mathias Hasselmann */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TOOL_SHELL_H__ #define __GTK_TOOL_SHELL_H__ diff --git a/gtk/gtktooltip.h b/gtk/gtktooltip.h index d91cdbaf9..6d21d3dbe 100644 --- a/gtk/gtktooltip.h +++ b/gtk/gtktooltip.h @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TOOLTIP_H__ #define __GTK_TOOLTIP_H__ diff --git a/gtk/gtktreedatalist.h b/gtk/gtktreedatalist.h index 49a0940f4..bd1928d78 100644 --- a/gtk/gtktreedatalist.h +++ b/gtk/gtktreedatalist.h @@ -17,13 +17,10 @@ * Boston, MA 02111-1307, USA. */ - #ifndef __GTK_TREE_DATA_LIST_H__ #define __GTK_TREE_DATA_LIST_H__ -#include <glib.h> -#include <glib-object.h> -#include "gtktreesortable.h" +#include <gtk/gtk.h> typedef struct _GtkTreeDataList GtkTreeDataList; struct _GtkTreeDataList diff --git a/gtk/gtktreednd.h b/gtk/gtktreednd.h index eb983b7ae..517ba50d2 100644 --- a/gtk/gtktreednd.h +++ b/gtk/gtktreednd.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TREE_DND_H__ #define __GTK_TREE_DND_H__ diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h index cc5b937d9..74185abb6 100644 --- a/gtk/gtktreemodel.h +++ b/gtk/gtktreemodel.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TREE_MODEL_H__ #define __GTK_TREE_MODEL_H__ diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h index e9ab5829b..43d3e0612 100644 --- a/gtk/gtktreemodelfilter.h +++ b/gtk/gtktreemodelfilter.h @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TREE_MODEL_FILTER_H__ #define __GTK_TREE_MODEL_FILTER_H__ diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h index cc2618991..d053f86ea 100644 --- a/gtk/gtktreemodelsort.h +++ b/gtk/gtktreemodelsort.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TREE_MODEL_SORT_H__ #define __GTK_TREE_MODEL_SORT_H__ diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h index 2c3e0a2b8..6c68ba473 100644 --- a/gtk/gtktreeselection.h +++ b/gtk/gtktreeselection.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TREE_SELECTION_H__ #define __GTK_TREE_SELECTION_H__ diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h index dd7282a19..ca9311fa1 100644 --- a/gtk/gtktreesortable.h +++ b/gtk/gtktreesortable.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TREE_SORTABLE_H__ #define __GTK_TREE_SORTABLE_H__ diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h index b7e61e2a1..7eb271148 100644 --- a/gtk/gtktreestore.h +++ b/gtk/gtktreestore.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TREE_STORE_H__ #define __GTK_TREE_STORE_H__ diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h index 9ea61a9ff..d5ff9a68f 100644 --- a/gtk/gtktreeview.h +++ b/gtk/gtktreeview.h @@ -16,6 +16,11 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TREE_VIEW_H__ #define __GTK_TREE_VIEW_H__ diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h index 89073858b..2d45ce583 100644 --- a/gtk/gtktreeviewcolumn.h +++ b/gtk/gtktreeviewcolumn.h @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TREE_VIEW_COLUMN_H__ #define __GTK_TREE_VIEW_COLUMN_H__ diff --git a/gtk/gtktypebuiltins.h.template b/gtk/gtktypebuiltins.h.template index 8c45c84db..0e9d9a6c8 100644 --- a/gtk/gtktypebuiltins.h.template +++ b/gtk/gtktypebuiltins.h.template @@ -1,4 +1,8 @@ /*** BEGIN file-header ***/ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TYPE_BUILTINS_H__ #define __GTK_TYPE_BUILTINS_H__ diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h index e0fd6ab93..67e6dfaa6 100644 --- a/gtk/gtktypeutils.h +++ b/gtk/gtktypeutils.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_TYPE_UTILS_H__ #define __GTK_TYPE_UTILS_H__ diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h index 7e1e6ead6..27fce6bcf 100644 --- a/gtk/gtkuimanager.h +++ b/gtk/gtkuimanager.h @@ -27,6 +27,11 @@ * files for a list of changes. These files are distributed with * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ + +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_UI_MANAGER_H__ #define __GTK_UI_MANAGER_H__ diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h index 8c21273c9..fd1c05b8f 100644 --- a/gtk/gtkvbbox.h +++ b/gtk/gtkvbbox.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_VBBOX_H__ #define __GTK_VBBOX_H__ diff --git a/gtk/gtkvbox.h b/gtk/gtkvbox.h index 3cdb2ad15..63a82310d 100644 --- a/gtk/gtkvbox.h +++ b/gtk/gtkvbox.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_VBOX_H__ #define __GTK_VBOX_H__ diff --git a/gtk/gtkversion.h.in b/gtk/gtkversion.h.in index b0b20bd5a..172c68876 100644 --- a/gtk/gtkversion.h.in +++ b/gtk/gtkversion.h.in @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_VERSION_H__ #define __GTK_VERSION_H__ diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h index 8b64f1743..d40fe6e4b 100644 --- a/gtk/gtkviewport.h +++ b/gtk/gtkviewport.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_VIEWPORT_H__ #define __GTK_VIEWPORT_H__ diff --git a/gtk/gtkvolumebutton.h b/gtk/gtkvolumebutton.h index 069c1228a..f28a7134c 100644 --- a/gtk/gtkvolumebutton.h +++ b/gtk/gtkvolumebutton.h @@ -27,6 +27,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_VOLUME_BUTTON_H__ #define __GTK_VOLUME_BUTTON_H__ diff --git a/gtk/gtkvpaned.h b/gtk/gtkvpaned.h index 10bb9a0c3..187ad5c48 100644 --- a/gtk/gtkvpaned.h +++ b/gtk/gtkvpaned.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_VPANED_H__ #define __GTK_VPANED_H__ diff --git a/gtk/gtkvruler.h b/gtk/gtkvruler.h index 2b27e52fe..35bf44417 100644 --- a/gtk/gtkvruler.h +++ b/gtk/gtkvruler.h @@ -34,6 +34,10 @@ * distribution. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_VRULER_H__ #define __GTK_VRULER_H__ diff --git a/gtk/gtkvscale.h b/gtk/gtkvscale.h index 8661b7515..8fb305dea 100644 --- a/gtk/gtkvscale.h +++ b/gtk/gtkvscale.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_VSCALE_H__ #define __GTK_VSCALE_H__ diff --git a/gtk/gtkvscrollbar.h b/gtk/gtkvscrollbar.h index bdd6c3d03..808b3e6b4 100644 --- a/gtk/gtkvscrollbar.h +++ b/gtk/gtkvscrollbar.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_VSCROLLBAR_H__ #define __GTK_VSCROLLBAR_H__ diff --git a/gtk/gtkvseparator.h b/gtk/gtkvseparator.h index e7fd88b0e..41095f1d6 100644 --- a/gtk/gtkvseparator.h +++ b/gtk/gtkvseparator.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_VSEPARATOR_H__ #define __GTK_VSEPARATOR_H__ diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 9358893cd..6d4b2a65a 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_WIDGET_H__ #define __GTK_WIDGET_H__ diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index 2f84c497c..d428da233 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -24,6 +24,10 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only <gtk/gtk.h> can be included directly." +#endif + #ifndef __GTK_WINDOW_H__ #define __GTK_WINDOW_H__ |