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 /gtk/gtksettings.h | |
| parent | e7df0579c298daf1eb3515379fc1fb5a03174ce6 (diff) | |
| download | gtk+-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
Diffstat (limited to 'gtk/gtksettings.h')
| -rw-r--r-- | gtk/gtksettings.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h index f058e00a68..ffab06c31e 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__ |