Index: gtk/gtkprogressbar.h =================================================================== --- gtk/gtkprogressbar.h (revision 20189) +++ gtk/gtkprogressbar.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_PROGRESS_BAR_H__ #define __GTK_PROGRESS_BAR_H__ Index: gtk/gtktypebuiltins.h.template =================================================================== --- gtk/gtktypebuiltins.h.template (revision 20189) +++ gtk/gtktypebuiltins.h.template (working copy) @@ -1,4 +1,8 @@ /*** BEGIN file-header ***/ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TYPE_BUILTINS_H__ #define __GTK_TYPE_BUILTINS_H__ Index: gtk/gtkfilechooserdialog.h =================================================================== --- gtk/gtkfilechooserdialog.h (revision 20189) +++ gtk/gtkfilechooserdialog.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_FILE_CHOOSER_DIALOG_H__ #define __GTK_FILE_CHOOSER_DIALOG_H__ Index: gtk/gtkwidget.h =================================================================== --- gtk/gtkwidget.h (revision 20189) +++ gtk/gtkwidget.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_WIDGET_H__ #define __GTK_WIDGET_H__ Index: gtk/gtktreemodelfilter.h =================================================================== --- gtk/gtktreemodelfilter.h (revision 20189) +++ gtk/gtktreemodelfilter.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TREE_MODEL_FILTER_H__ #define __GTK_TREE_MODEL_FILTER_H__ Index: gtk/gtksizegroup.h =================================================================== --- gtk/gtksizegroup.h (revision 20189) +++ gtk/gtksizegroup.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_SIZE_GROUP_H__ #define __GTK_SIZE_GROUP_H__ Index: gtk/gtkrange.h =================================================================== --- gtk/gtkrange.h (revision 20189) +++ gtk/gtkrange.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_RANGE_H__ #define __GTK_RANGE_H__ Index: gtk/gtkfixed.h =================================================================== --- gtk/gtkfixed.h (revision 20189) +++ gtk/gtkfixed.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_FIXED_H__ #define __GTK_FIXED_H__ Index: gtk/gtkexpander.h =================================================================== --- gtk/gtkexpander.h (revision 20189) +++ gtk/gtkexpander.h (working copy) @@ -21,6 +21,10 @@ * Mark McLoughlin */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_EXPANDER_H__ #define __GTK_EXPANDER_H__ Index: gtk/gtkcelllayout.h =================================================================== --- gtk/gtkcelllayout.h (revision 20189) +++ gtk/gtkcelllayout.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_CELL_LAYOUT_H__ #define __GTK_CELL_LAYOUT_H__ Index: gtk/gtkadjustment.h =================================================================== --- gtk/gtkadjustment.h (revision 20189) +++ gtk/gtkadjustment.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ADJUSTMENT_H__ #define __GTK_ADJUSTMENT_H__ Index: gtk/gtktextview.h =================================================================== --- gtk/gtktextview.h (revision 20189) +++ gtk/gtktextview.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_TEXT_VIEW_H__ #define __GTK_TEXT_VIEW_H__ @@ -83,8 +87,6 @@ struct _GtkTextView PangoTabArray *tabs; guint editable : 1; - - guint overwrite_mode : 1; guint cursor_visible : 1; Index: gtk/gtkrecentchooserdialog.h =================================================================== --- gtk/gtkrecentchooserdialog.h (revision 20189) +++ gtk/gtkrecentchooserdialog.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_RECENT_CHOOSER_DIALOG_H__ #define __GTK_RECENT_CHOOSER_DIALOG_H__ Index: gtk/gtkstyle.h =================================================================== --- gtk/gtkstyle.h (revision 20189) +++ gtk/gtkstyle.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_STYLE_H__ #define __GTK_STYLE_H__ Index: gtk/gtkmessagedialog.h =================================================================== --- gtk/gtkmessagedialog.h (revision 20189) +++ gtk/gtkmessagedialog.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_MESSAGE_DIALOG_H__ #define __GTK_MESSAGE_DIALOG_H__ Index: gtk/gtkaccellabel.h =================================================================== --- gtk/gtkaccellabel.h (revision 20189) +++ gtk/gtkaccellabel.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ACCEL_LABEL_H__ #define __GTK_ACCEL_LABEL_H__ Index: gtk/gtktextiter.h =================================================================== --- gtk/gtktextiter.h (revision 20189) +++ gtk/gtktextiter.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_TEXT_ITER_H__ #define __GTK_TEXT_ITER_H__ Index: gtk/gtktreednd.h =================================================================== --- gtk/gtktreednd.h (revision 20189) +++ gtk/gtktreednd.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TREE_DND_H__ #define __GTK_TREE_DND_H__ Index: gtk/gtkmenubar.h =================================================================== --- gtk/gtkmenubar.h (revision 20189) +++ gtk/gtkmenubar.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_MENU_BAR_H__ #define __GTK_MENU_BAR_H__ Index: gtk/gtktextmark.h =================================================================== --- gtk/gtktextmark.h (revision 20189) +++ gtk/gtktextmark.h (working copy) @@ -47,6 +47,10 @@ * */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TEXT_MARK_H__ #define __GTK_TEXT_MARK_H__ Index: gtk/gtkseparator.h =================================================================== --- gtk/gtkseparator.h (revision 20189) +++ gtk/gtkseparator.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_SEPARATOR_H__ #define __GTK_SEPARATOR_H__ Index: gtk/gtkmodules.h =================================================================== --- gtk/gtkmodules.h (revision 20189) +++ gtk/gtkmodules.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_MODULES_H__ #define __GTK_MODULES_H__ Index: gtk/gtkcellview.h =================================================================== --- gtk/gtkcellview.h (revision 20189) +++ gtk/gtkcellview.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_CELL_VIEW_H__ #define __GTK_CELL_VIEW_H__ Index: gtk/gtktogglebutton.h =================================================================== --- gtk/gtktogglebutton.h (revision 20189) +++ gtk/gtktogglebutton.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_TOGGLE_BUTTON_H__ #define __GTK_TOGGLE_BUTTON_H__ Index: gtk/gtktextbuffer.h =================================================================== --- gtk/gtktextbuffer.h (revision 20189) +++ gtk/gtktextbuffer.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_TEXT_BUFFER_H__ #define __GTK_TEXT_BUFFER_H__ Index: gtk/gtkvbox.h =================================================================== --- gtk/gtkvbox.h (revision 20189) +++ gtk/gtkvbox.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_VBOX_H__ #define __GTK_VBOX_H__ Index: gtk/gtktoggleaction.h =================================================================== --- gtk/gtktoggleaction.h (revision 20189) +++ gtk/gtktoggleaction.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_TOGGLE_ACTION_H__ #define __GTK_TOGGLE_ACTION_H__ Index: gtk/gtkiconfactory.h =================================================================== --- gtk/gtkiconfactory.h (revision 20189) +++ gtk/gtkiconfactory.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ICON_FACTORY_H__ #define __GTK_ICON_FACTORY_H__ Index: gtk/gtktreemodel.h =================================================================== --- gtk/gtktreemodel.h (revision 20189) +++ gtk/gtktreemodel.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TREE_MODEL_H__ #define __GTK_TREE_MODEL_H__ @@ -259,9 +263,6 @@ void gtk_tree_model_rows_reordered GtkTreeIter *iter, gint *new_order); - - - G_END_DECLS #endif /* __GTK_TREE_MODEL_H__ */ Index: gtk/gtkcheckmenuitem.h =================================================================== --- gtk/gtkcheckmenuitem.h (revision 20189) +++ gtk/gtkcheckmenuitem.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_CHECK_MENU_ITEM_H__ #define __GTK_CHECK_MENU_ITEM_H__ Index: gtk/gtkcolorsel.h =================================================================== --- gtk/gtkcolorsel.h (revision 20189) +++ gtk/gtkcolorsel.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_COLOR_SELECTION_H__ #define __GTK_COLOR_SELECTION_H__ Index: gtk/gtkscrollbar.h =================================================================== --- gtk/gtkscrollbar.h (revision 20189) +++ gtk/gtkscrollbar.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_SCROLLBAR_H__ #define __GTK_SCROLLBAR_H__ Index: gtk/gtkbuilder.h =================================================================== --- gtk/gtkbuilder.h (revision 20189) +++ gtk/gtkbuilder.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_BUILDER_H__ #define __GTK_BUILDER_H__ Index: gtk/gtkdialog.h =================================================================== --- gtk/gtkdialog.h (revision 20189) +++ gtk/gtkdialog.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_DIALOG_H__ #define __GTK_DIALOG_H__ Index: gtk/gtkscrolledwindow.h =================================================================== --- gtk/gtkscrolledwindow.h (revision 20189) +++ gtk/gtkscrolledwindow.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_SCROLLED_WINDOW_H__ #define __GTK_SCROLLED_WINDOW_H__ Index: gtk/gtkprintcontext.h =================================================================== --- gtk/gtkprintcontext.h (revision 20189) +++ gtk/gtkprintcontext.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_PRINT_CONTEXT_H__ #define __GTK_PRINT_CONTEXT_H__ Index: gtk/gtkspinbutton.h =================================================================== --- gtk/gtkspinbutton.h (revision 20189) +++ gtk/gtkspinbutton.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_SPIN_BUTTON_H__ #define __GTK_SPIN_BUTTON_H__ Index: gtk/gtktoolshell.h =================================================================== --- gtk/gtktoolshell.h (revision 20189) +++ gtk/gtktoolshell.h (working copy) @@ -20,6 +20,10 @@ * Mathias Hasselmann */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TOOL_SHELL_H__ #define __GTK_TOOL_SHELL_H__ Index: gtk/gtkhseparator.h =================================================================== --- gtk/gtkhseparator.h (revision 20189) +++ gtk/gtkhseparator.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_HSEPARATOR_H__ #define __GTK_HSEPARATOR_H__ Index: gtk/gtktexttag.h =================================================================== --- gtk/gtktexttag.h (revision 20189) +++ gtk/gtktexttag.h (working copy) @@ -47,6 +47,10 @@ * */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TEXT_TAG_H__ #define __GTK_TEXT_TAG_H__ Index: gtk/gtkgamma.h =================================================================== --- gtk/gtkgamma.h (revision 20189) +++ gtk/gtkgamma.h (working copy) @@ -34,6 +34,10 @@ * distribution. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_GAMMA_CURVE_H__ #define __GTK_GAMMA_CURVE_H__ Index: gtk/gtkcellrendererpixbuf.h =================================================================== --- gtk/gtkcellrendererpixbuf.h (revision 20189) +++ gtk/gtkcellrendererpixbuf.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_PIXBUF_H__ #define __GTK_CELL_RENDERER_PIXBUF_H__ Index: gtk/gtkhscrollbar.h =================================================================== --- gtk/gtkhscrollbar.h (revision 20189) +++ gtk/gtkhscrollbar.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_HSCROLLBAR_H__ #define __GTK_HSCROLLBAR_H__ Index: gtk/gtkbin.h =================================================================== --- gtk/gtkbin.h (revision 20189) +++ gtk/gtkbin.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_BIN_H__ #define __GTK_BIN_H__ Index: gtk/gtkprintjob.h =================================================================== --- gtk/gtkprintjob.h (revision 20189) +++ gtk/gtkprintjob.h (working copy) @@ -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 #include +#include #include -#include G_BEGIN_DECLS Index: gtk/gtklinkbutton.h =================================================================== --- gtk/gtklinkbutton.h (revision 20189) +++ gtk/gtklinkbutton.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_LINK_BUTTON_H__ #define __GTK_LINK_BUTTON_H__ Index: gtk/gtktreeviewcolumn.h =================================================================== --- gtk/gtktreeviewcolumn.h (revision 20189) +++ gtk/gtktreeviewcolumn.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TREE_VIEW_COLUMN_H__ #define __GTK_TREE_VIEW_COLUMN_H__ @@ -238,4 +242,3 @@ G_END_DECLS #endif /* __GTK_TREE_VIEW_COLUMN_H__ */ - Index: gtk/gtkcellrenderertoggle.h =================================================================== --- gtk/gtkcellrenderertoggle.h (revision 20189) +++ gtk/gtkcellrenderertoggle.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_TOGGLE_H__ #define __GTK_CELL_RENDERER_TOGGLE_H__ @@ -74,5 +78,4 @@ void gtk_cell_renderer_toggle G_END_DECLS - #endif /* __GTK_CELL_RENDERER_TOGGLE_H__ */ Index: gtk/gtkcalendar.h =================================================================== --- gtk/gtkcalendar.h (revision 20189) +++ gtk/gtkcalendar.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_CALENDAR_H__ #define __GTK_CALENDAR_H__ Index: gtk/gtktreestore.h =================================================================== --- gtk/gtktreestore.h (revision 20189) +++ gtk/gtktreestore.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TREE_STORE_H__ #define __GTK_TREE_STORE_H__ Index: gtk/gtkaccelgroup.h =================================================================== --- gtk/gtkaccelgroup.h (revision 20189) +++ gtk/gtkaccelgroup.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ACCEL_GROUP_H__ #define __GTK_ACCEL_GROUP_H__ Index: gtk/gtktreemodelsort.h =================================================================== --- gtk/gtktreemodelsort.h (revision 20189) +++ gtk/gtktreemodelsort.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TREE_MODEL_SORT_H__ #define __GTK_TREE_MODEL_SORT_H__ Index: gtk/gtkcellrenderercombo.h =================================================================== --- gtk/gtkcellrenderercombo.h (revision 20189) +++ gtk/gtkcellrenderercombo.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_COMBO_H__ #define __GTK_CELL_RENDERER_COMBO_H__ Index: gtk/gtkcomboboxentry.h =================================================================== --- gtk/gtkcomboboxentry.h (revision 20189) +++ gtk/gtkcomboboxentry.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_COMBO_BOX_ENTRY_H__ #define __GTK_COMBO_BOX_ENTRY_H__ Index: gtk/gtkaboutdialog.h =================================================================== --- gtk/gtkaboutdialog.h (revision 20189) +++ gtk/gtkaboutdialog.h (working copy) @@ -22,6 +22,10 @@ Author: Anders Carlsson */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_ABOUT_DIALOG_H__ #define __GTK_ABOUT_DIALOG_H__ Index: gtk/gtkfontbutton.h =================================================================== --- gtk/gtkfontbutton.h (revision 20189) +++ gtk/gtkfontbutton.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_FONT_BUTTON_H__ #define __GTK_FONT_BUTTON_H__ @@ -94,7 +98,3 @@ G_END_DECLS #endif /* __GTK_FONT_BUTTON_H__ */ - - - - Index: gtk/gtkdnd.h =================================================================== --- gtk/gtkdnd.h (revision 20189) +++ gtk/gtkdnd.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_DND_H__ #define __GTK_DND_H__ @@ -182,6 +186,3 @@ void gtk_drag_set_default_icon (GdkColor G_END_DECLS #endif /* __GTK_DND_H__ */ - - - Index: gtk/gtkalignment.h =================================================================== --- gtk/gtkalignment.h (revision 20189) +++ gtk/gtkalignment.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ALIGNMENT_H__ #define __GTK_ALIGNMENT_H__ Index: gtk/gtkcurve.h =================================================================== --- gtk/gtkcurve.h (revision 20189) +++ gtk/gtkcurve.h (working copy) @@ -34,6 +34,10 @@ * distribution. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_CURVE_H__ #define __GTK_CURVE_H__ Index: gtk/gtktestutils.c =================================================================== --- gtk/gtktestutils.c (revision 20189) +++ gtk/gtktestutils.c (working copy) @@ -23,7 +23,6 @@ #include "gtktestutils.h" #include -#include #include "gtkalias.h" #include Index: gtk/gtkbindings.h =================================================================== --- gtk/gtkbindings.h (revision 20189) +++ gtk/gtkbindings.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_BINDINGS_H__ #define __GTK_BINDINGS_H__ Index: gtk/gtkfilechooserbutton.h =================================================================== --- gtk/gtkfilechooserbutton.h (revision 20189) +++ gtk/gtkfilechooserbutton.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_FILE_CHOOSER_BUTTON_H__ #define __GTK_FILE_CHOOSER_BUTTON_H__ Index: gtk/gtkcellrendererspin.h =================================================================== --- gtk/gtkcellrendererspin.h (revision 20189) +++ gtk/gtkcellrendererspin.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_SPIN_H__ #define __GTK_CELL_RENDERER_SPIN_H__ Index: gtk/gtktestutils.h =================================================================== --- gtk/gtktestutils.h (revision 20189) +++ gtk/gtktestutils.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_TEST_UTILS_H__ #define __GTK_TEST_UTILS_H__ Index: gtk/gtkhandlebox.h =================================================================== --- gtk/gtkhandlebox.h (revision 20189) +++ gtk/gtkhandlebox.h (working copy) @@ -29,6 +29,9 @@ * their parents. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif #ifndef __GTK_HANDLE_BOX_H__ #define __GTK_HANDLE_BOX_H__ Index: gtk/gtktipsquery.h =================================================================== --- gtk/gtktipsquery.h (revision 20189) +++ gtk/gtktipsquery.h (working copy) @@ -32,8 +32,7 @@ #ifndef __GTK_TIPS_QUERY_H__ #define __GTK_TIPS_QUERY_H__ - -#include +#include G_BEGIN_DECLS Index: gtk/gtktextlayout.h =================================================================== --- gtk/gtktextlayout.h (revision 20189) +++ gtk/gtktextlayout.h (working copy) @@ -89,8 +89,7 @@ #error "You are not supposed to be including this file; the equivalent public API is in gtktextview.h" #endif -#include -#include +#include G_BEGIN_DECLS Index: gtk/gtkprinter.h =================================================================== --- gtk/gtkprinter.h (revision 20189) +++ gtk/gtkprinter.h (working copy) @@ -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 #include -#include -#include +#include G_BEGIN_DECLS @@ -71,7 +70,8 @@ struct _GtkPrinterClass { GObjectClass parent_class; - void (*details_acquired) (GtkPrinter *printer, gboolean success); + void (*details_acquired) (GtkPrinter *printer, + gboolean success); /* Padding for future expansion */ void (*_gtk_reserved1) (void); Index: gtk/gtktextchild.h =================================================================== --- gtk/gtktextchild.h (revision 20189) +++ gtk/gtktextchild.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_TEXT_CHILD_H__ #define __GTK_TEXT_CHILD_H__ Index: gtk/gtkradiotoolbutton.h =================================================================== --- gtk/gtkradiotoolbutton.h (revision 20189) +++ gtk/gtkradiotoolbutton.h (working copy) @@ -20,6 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_RADIO_TOOL_BUTTON_H__ #define __GTK_RADIO_TOOL_BUTTON_H__ Index: gtk/gtktreeview.h =================================================================== --- gtk/gtktreeview.h (revision 20189) +++ gtk/gtktreeview.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_TREE_VIEW_H__ #define __GTK_TREE_VIEW_H__ @@ -426,4 +431,3 @@ G_END_DECLS #endif /* __GTK_TREE_VIEW_H__ */ - Index: gtk/gtkvolumebutton.h =================================================================== --- gtk/gtkvolumebutton.h (revision 20189) +++ gtk/gtkvolumebutton.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_VOLUME_BUTTON_H__ #define __GTK_VOLUME_BUTTON_H__ @@ -61,4 +65,3 @@ GtkWidget* gtk_volume_button_new (void) G_END_DECLS #endif /* __GTK_VOLUME_BUTTON_H__ */ - Index: gtk/gtktreeselection.h =================================================================== --- gtk/gtktreeselection.h (revision 20189) +++ gtk/gtktreeselection.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TREE_SELECTION_H__ #define __GTK_TREE_SELECTION_H__ @@ -120,4 +124,3 @@ G_END_DECLS #endif /* __GTK_TREE_SELECTION_H__ */ - Index: gtk/gtktoggletoolbutton.h =================================================================== --- gtk/gtktoggletoolbutton.h (revision 20189) +++ gtk/gtktoggletoolbutton.h (working copy) @@ -20,6 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TOGGLE_TOOL_BUTTON_H__ #define __GTK_TOGGLE_TOOL_BUTTON_H__ Index: gtk/gtk.h =================================================================== --- gtk/gtk.h (revision 20189) +++ gtk/gtk.h (working copy) @@ -27,6 +27,7 @@ #ifndef __GTK_H__ #define __GTK_H__ +#define __GTK_H_INSIDE__ #include #include @@ -231,5 +232,6 @@ #include #include +#undef __GTK_H_INSIDE__ #endif /* __GTK_H__ */ Index: gtk/gtkshow.h =================================================================== --- gtk/gtkshow.h (revision 20189) +++ gtk/gtkshow.h (working copy) @@ -20,6 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_SHOW_H__ #define __GTK_SHOW_H__ Index: gtk/gtkstock.h =================================================================== --- gtk/gtkstock.h (revision 20189) +++ gtk/gtkstock.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_STOCK_H__ #define __GTK_STOCK_H__ Index: gtk/gtkiconview.h =================================================================== --- gtk/gtkiconview.h (revision 20189) +++ gtk/gtkiconview.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ICON_VIEW_H__ #define __GTK_ICON_VIEW_H__ Index: gtk/gtkimmulticontext.h =================================================================== --- gtk/gtkimmulticontext.h (revision 20189) +++ gtk/gtkimmulticontext.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_IM_MULTICONTEXT_H__ #define __GTK_IM_MULTICONTEXT_H__ Index: gtk/gtktexttagtable.h =================================================================== --- gtk/gtktexttagtable.h (revision 20189) +++ gtk/gtktexttagtable.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_TEXT_TAG_TABLE_H__ #define __GTK_TEXT_TAG_TABLE_H__ Index: gtk/gtkversion.h.in =================================================================== --- gtk/gtkversion.h.in (revision 20189) +++ gtk/gtkversion.h.in (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_VERSION_H__ #define __GTK_VERSION_H__ @@ -44,6 +48,4 @@ (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \ GTK_MICRO_VERSION >= (micro))) - #endif /* __GTK_VERSION_H__ */ - Index: gtk/gtkprintbackend.h =================================================================== --- gtk/gtkprintbackend.h (revision 20189) +++ gtk/gtkprintbackend.h (working copy) @@ -29,10 +29,9 @@ #error "GtkPrintBackend is not supported API for general use" #endif -#include #include +#include -#include "gtkprintsettings.h" #include "gtkprinteroptionset.h" #include "gtkprintjob.h" Index: gtk/gtkwindow.h =================================================================== --- gtk/gtkwindow.h (revision 20189) +++ gtk/gtkwindow.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_WINDOW_H__ #define __GTK_WINDOW_H__ Index: gtk/gtktoolbutton.h =================================================================== --- gtk/gtktoolbutton.h (revision 20189) +++ gtk/gtktoolbutton.h (working copy) @@ -20,6 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TOOL_BUTTON_H__ #define __GTK_TOOL_BUTTON_H__ Index: gtk/gtktexttypes.h =================================================================== --- gtk/gtktexttypes.h (revision 20189) +++ gtk/gtktexttypes.h (working copy) @@ -27,9 +27,7 @@ #ifndef __GTK_TEXT_TYPES_H__ #define __GTK_TEXT_TYPES_H__ -#include - -#include +#include #include G_BEGIN_DECLS Index: gtk/gtkimcontext.h =================================================================== --- gtk/gtkimcontext.h (revision 20189) +++ gtk/gtkimcontext.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_IM_CONTEXT_H__ #define __GTK_IM_CONTEXT_H__ Index: gtk/gtkmain.h =================================================================== --- gtk/gtkmain.h (revision 20189) +++ gtk/gtkmain.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_MAIN_H__ #define __GTK_MAIN_H__ Index: gtk/gtktable.h =================================================================== --- gtk/gtktable.h (revision 20189) +++ gtk/gtktable.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_TABLE_H__ #define __GTK_TABLE_H__ Index: gtk/gtkscale.h =================================================================== --- gtk/gtkscale.h (revision 20189) +++ gtk/gtkscale.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_SCALE_H__ #define __GTK_SCALE_H__ Index: gtk/gtkbox.h =================================================================== --- gtk/gtkbox.h (revision 20189) +++ gtk/gtkbox.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_BOX_H__ #define __GTK_BOX_H__ Index: gtk/gtkframe.h =================================================================== --- gtk/gtkframe.h (revision 20189) +++ gtk/gtkframe.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_FRAME_H__ #define __GTK_FRAME_H__ Index: gtk/gtkmenutoolbutton.h =================================================================== --- gtk/gtkmenutoolbutton.h (revision 20189) +++ gtk/gtkmenutoolbutton.h (working copy) @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_MENU_TOOL_BUTTON_H__ #define __GTK_MENU_TOOL_BUTTON_H__ Index: gtk/gtkclist.c =================================================================== --- gtk/gtkclist.c (revision 20189) +++ gtk/gtkclist.c (working copy) @@ -35,6 +35,7 @@ #include "gtkmain.h" #include "gtkobject.h" +#include "gtkctree.h" #include "gtkclist.h" #include "gtkbindings.h" #include "gtkdnd.h" Index: gtk/gtkbutton.h =================================================================== --- gtk/gtkbutton.h (revision 20189) +++ gtk/gtkbutton.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_BUTTON_H__ #define __GTK_BUTTON_H__ Index: gtk/gtkaction.h =================================================================== --- gtk/gtkaction.h (revision 20189) +++ gtk/gtkaction.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ACTION_H__ #define __GTK_ACTION_H__ Index: gtk/gtkclist.h =================================================================== --- gtk/gtkclist.h (revision 20189) +++ gtk/gtkclist.h (working copy) @@ -30,15 +30,7 @@ #ifndef __GTK_CLIST_H__ #define __GTK_CLIST_H__ -#include -#include -#include -#include -#include -#include -#include -#include - +#include G_BEGIN_DECLS Index: gtk/gtkvbbox.h =================================================================== --- gtk/gtkvbbox.h (revision 20189) +++ gtk/gtkvbbox.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_VBBOX_H__ #define __GTK_VBBOX_H__ Index: gtk/gtkpagesetupunixdialog.h =================================================================== --- gtk/gtkpagesetupunixdialog.h (revision 20189) +++ gtk/gtkpagesetupunixdialog.h (working copy) @@ -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 -#include -#include +#include G_BEGIN_DECLS Index: gtk/gtkpaned.h =================================================================== --- gtk/gtkpaned.h (revision 20189) +++ gtk/gtkpaned.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_PANED_H__ #define __GTK_PANED_H__ Index: gtk/gtklistitem.h =================================================================== --- gtk/gtklistitem.h (revision 20189) +++ gtk/gtklistitem.h (working copy) @@ -29,9 +29,7 @@ #ifndef __GTK_LIST_ITEM_H__ #define __GTK_LIST_ITEM_H__ - -#include -#include +#include G_BEGIN_DECLS Index: gtk/gtkaccessible.h =================================================================== --- gtk/gtkaccessible.h (revision 20189) +++ gtk/gtkaccessible.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_ACCESSIBLE_H__ #define __GTK_ACCESSIBLE_H__ Index: gtk/gtkhscale.h =================================================================== --- gtk/gtkhscale.h (revision 20189) +++ gtk/gtkhscale.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_HSCALE_H__ #define __GTK_HSCALE_H__ Index: gtk/gtksettings.h =================================================================== --- gtk/gtksettings.h (revision 20189) +++ gtk/gtksettings.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_SETTINGS_H__ #define __GTK_SETTINGS_H__ @@ -49,11 +54,12 @@ struct _GtkSettings GtkRcContext *rc_context; GdkScreen *screen; }; + struct _GtkSettingsClass { GObjectClass parent_class; - }; + struct _GtkSettingsValue { /* origin should be something like "filename:linenumber" for rc files, Index: gtk/gtkhpaned.h =================================================================== --- gtk/gtkhpaned.h (revision 20189) +++ gtk/gtkhpaned.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_HPANED_H__ #define __GTK_HPANED_H__ Index: gtk/gtkcombo.h =================================================================== --- gtk/gtkcombo.h (revision 20189) +++ gtk/gtkcombo.h (working copy) @@ -29,8 +29,8 @@ #ifndef __GTK_SMART_COMBO_H__ #define __GTK_SMART_COMBO_H__ -#include -#include +#include + G_BEGIN_DECLS Index: gtk/gtkobject.h =================================================================== --- gtk/gtkobject.h (revision 20189) +++ gtk/gtkobject.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_OBJECT_H__ #define __GTK_OBJECT_H__ Index: gtk/gtkfilesel.h =================================================================== --- gtk/gtkfilesel.h (revision 20189) +++ gtk/gtkfilesel.h (working copy) @@ -29,9 +29,7 @@ #ifndef __GTK_FILESEL_H__ #define __GTK_FILESEL_H__ - -#include -#include +#include G_BEGIN_DECLS Index: gtk/gtkrecentchoosermenu.h =================================================================== --- gtk/gtkrecentchoosermenu.h (revision 20189) +++ gtk/gtkrecentchoosermenu.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_RECENT_CHOOSER_MENU_H__ #define __GTK_RECENT_CHOOSER_MENU_H__ Index: gtk/gtkradiobutton.h =================================================================== --- gtk/gtkradiobutton.h (revision 20189) +++ gtk/gtkradiobutton.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_RADIO_BUTTON_H__ #define __GTK_RADIO_BUTTON_H__ Index: gtk/gtktearoffmenuitem.h =================================================================== --- gtk/gtktearoffmenuitem.h (revision 20189) +++ gtk/gtktearoffmenuitem.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_TEAROFF_MENU_ITEM_H__ #define __GTK_TEAROFF_MENU_ITEM_H__ Index: gtk/gtkradioaction.h =================================================================== --- gtk/gtkradioaction.h (revision 20189) +++ gtk/gtkradioaction.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_RADIO_ACTION_H__ #define __GTK_RADIO_ACTION_H__ Index: gtk/gtkcolorseldialog.h =================================================================== --- gtk/gtkcolorseldialog.h (revision 20189) +++ gtk/gtkcolorseldialog.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_COLOR_SELECTION_DIALOG_H__ #define __GTK_COLOR_SELECTION_DIALOG_H__ Index: gtk/gtkoldeditable.h =================================================================== --- gtk/gtkoldeditable.h (revision 20189) +++ gtk/gtkoldeditable.h (working copy) @@ -29,10 +29,8 @@ #ifndef __GTK_OLD_EDITABLE_H__ #define __GTK_OLD_EDITABLE_H__ +#include -#include -#include -#include G_BEGIN_DECLS Index: gtk/gtkvscale.h =================================================================== --- gtk/gtkvscale.h (revision 20189) +++ gtk/gtkvscale.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_VSCALE_H__ #define __GTK_VSCALE_H__ Index: gtk/gtkprintunixdialog.h =================================================================== --- gtk/gtkprintunixdialog.h (revision 20189) +++ gtk/gtkprintunixdialog.h (working copy) @@ -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 +#include #include #include -#include -#include G_BEGIN_DECLS Index: gtk/gtkimcontextsimple.h =================================================================== --- gtk/gtkimcontextsimple.h (revision 20189) +++ gtk/gtkimcontextsimple.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_IM_CONTEXT_SIMPLE_H__ #define __GTK_IM_CONTEXT_SIMPLE_H__ Index: gtk/gtkselection.h =================================================================== --- gtk/gtkselection.h (revision 20189) +++ gtk/gtkselection.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_SELECTION_H__ #define __GTK_SELECTION_H__ Index: gtk/gtkoptionmenu.h =================================================================== --- gtk/gtkoptionmenu.h (revision 20189) +++ gtk/gtkoptionmenu.h (working copy) @@ -29,9 +29,7 @@ #ifndef __GTK_OPTION_MENU_H__ #define __GTK_OPTION_MENU_H__ - -#include -#include +#include G_BEGIN_DECLS Index: gtk/gtkctree.h =================================================================== --- gtk/gtkctree.h (revision 20189) +++ gtk/gtkctree.h (working copy) @@ -33,7 +33,7 @@ #ifndef __GTK_CTREE_H__ #define __GTK_CTREE_H__ -#include +#include G_BEGIN_DECLS Index: gtk/gtkrecentchooser.h =================================================================== --- gtk/gtkrecentchooser.h (revision 20189) +++ gtk/gtkrecentchooser.h (working copy) @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_RECENT_CHOOSER_H__ #define __GTK_RECENT_CHOOSER_H__ Index: gtk/gtkfontsel.h =================================================================== --- gtk/gtkfontsel.h (revision 20189) +++ gtk/gtkfontsel.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_FONTSEL_H__ #define __GTK_FONTSEL_H__ Index: gtk/gtkvpaned.h =================================================================== --- gtk/gtkvpaned.h (revision 20189) +++ gtk/gtkvpaned.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_VPANED_H__ #define __GTK_VPANED_H__ Index: gtk/gtkrecentfilter.h =================================================================== --- gtk/gtkrecentfilter.h (revision 20189) +++ gtk/gtkrecentfilter.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_RECENT_FILTER_H__ #define __GTK_RECENT_FILTER_H__ Index: gtk/gtkactiongroup.h =================================================================== --- gtk/gtkactiongroup.h (revision 20189) +++ gtk/gtkactiongroup.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ACTION_GROUP_H__ #define __GTK_ACTION_GROUP_H__ Index: gtk/gtkcellrenderer.h =================================================================== --- gtk/gtkcellrenderer.h (revision 20189) +++ gtk/gtkcellrenderer.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_H__ #define __GTK_CELL_RENDERER_H__ Index: gtk/gtkstatusbar.h =================================================================== --- gtk/gtkstatusbar.h (revision 20189) +++ gtk/gtkstatusbar.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_STATUSBAR_H__ #define __GTK_STATUSBAR_H__ Index: gtk/gtklist.h =================================================================== --- gtk/gtklist.h (revision 20189) +++ gtk/gtklist.h (working copy) @@ -29,11 +29,7 @@ #ifndef __GTK_LIST_H__ #define __GTK_LIST_H__ - -#include -#include -#include -#include +#include G_BEGIN_DECLS Index: gtk/gtkdrawingarea.h =================================================================== --- gtk/gtkdrawingarea.h (revision 20189) +++ gtk/gtkdrawingarea.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_DRAWING_AREA_H__ #define __GTK_DRAWING_AREA_H__ Index: gtk/gtkitemfactory.h =================================================================== --- gtk/gtkitemfactory.h (revision 20189) +++ gtk/gtkitemfactory.h (working copy) @@ -32,8 +32,8 @@ #ifndef __GTK_ITEM_FACTORY_H__ #define __GTK_ITEM_FACTORY_H__ +#include -#include G_BEGIN_DECLS Index: gtk/gtkruler.h =================================================================== --- gtk/gtkruler.h (revision 20189) +++ gtk/gtkruler.h (working copy) @@ -34,6 +34,10 @@ * distribution. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_RULER_H__ #define __GTK_RULER_H__ Index: gtk/gtkaspectframe.h =================================================================== --- gtk/gtkaspectframe.h (revision 20189) +++ gtk/gtkaspectframe.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ASPECT_FRAME_H__ #define __GTK_ASPECT_FRAME_H__ Index: gtk/gtkstatusicon.h =================================================================== --- gtk/gtkstatusicon.h (revision 20189) +++ gtk/gtkstatusicon.h (working copy) @@ -21,6 +21,10 @@ * Mark McLoughlin */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_STATUS_ICON_H__ #define __GTK_STATUS_ICON_H__ Index: gtk/gtkpapersize.h =================================================================== --- gtk/gtkpapersize.h (revision 20189) +++ gtk/gtkpapersize.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_PAPER_SIZE_H__ #define __GTK_PAPER_SIZE_H__ Index: gtk/gtkicontheme.h =================================================================== --- gtk/gtkicontheme.h (revision 20189) +++ gtk/gtkicontheme.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_ICON_THEME_H__ #define __GTK_ICON_THEME_H__ Index: gtk/gtkrecentmanager.h =================================================================== --- gtk/gtkrecentmanager.h (revision 20189) +++ gtk/gtkrecentmanager.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_RECENT_MANAGER_H__ #define __GTK_RECENT_MANAGER_H__ Index: gtk/gtkimage.h =================================================================== --- gtk/gtkimage.h (revision 20189) +++ gtk/gtkimage.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_IMAGE_H__ #define __GTK_IMAGE_H__ Index: gtk/gtkeventbox.h =================================================================== --- gtk/gtkeventbox.h (revision 20189) +++ gtk/gtkeventbox.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_EVENT_BOX_H__ #define __GTK_EVENT_BOX_H__ Index: gtk/gtkhruler.h =================================================================== --- gtk/gtkhruler.h (revision 20189) +++ gtk/gtkhruler.h (working copy) @@ -34,6 +34,10 @@ * distribution. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_HRULER_H__ #define __GTK_HRULER_H__ Index: gtk/gtkeditable.h =================================================================== --- gtk/gtkeditable.h (revision 20189) +++ gtk/gtkeditable.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_EDITABLE_H__ #define __GTK_EDITABLE_H__ Index: gtk/gtkcolorbutton.h =================================================================== --- gtk/gtkcolorbutton.h (revision 20189) +++ gtk/gtkcolorbutton.h (working copy) @@ -18,6 +18,7 @@ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + /* Color picker button for GNOME * * Author: Federico Mena @@ -28,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 can be included directly." +#endif + #ifndef __GTK_COLOR_BUTTON_H__ #define __GTK_COLOR_BUTTON_H__ @@ -37,7 +42,7 @@ G_BEGIN_DECLS -/* The GtkColorSelectionButton widget is a simple color picker in a button. +/* The GtkColorButton widget is a simple color picker in a button. * The button displays a sample of the currently selected color. When * the user clicks on the button, a color selection dialog pops up. * The color picker emits the "color_set" signal when the color is set. @@ -96,7 +101,3 @@ G_CONST_RETURN gchar *gtk_color_button_g G_END_DECLS #endif /* __GTK_COLOR_BUTTON_H__ */ - - - - Index: gtk/gtksignal.h =================================================================== --- gtk/gtksignal.h (revision 20189) +++ gtk/gtksignal.h (working copy) @@ -24,18 +24,15 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#ifndef GTK_DISABLE_DEPRECATED + #ifndef __GTK_SIGNAL_H__ #define __GTK_SIGNAL_H__ - -#include -#include -#include +#include G_BEGIN_DECLS -#ifndef GTK_DISABLE_DEPRECATED - #define gtk_signal_default_marshaller g_cclosure_marshal_VOID__VOID @@ -144,8 +141,8 @@ void gtk_signal_compat_matched (GtkObje GSignalMatchType match, guint action); -#endif /* GTK_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __GTK_SIGNAL_H__ */ + +#endif /* GTK_DISABLE_DEPRECATED */ Index: gtk/gtksocket.h =================================================================== --- gtk/gtksocket.h (revision 20189) +++ gtk/gtksocket.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_SOCKET_H__ #define __GTK_SOCKET_H__ Index: gtk/gtkmisc.h =================================================================== --- gtk/gtkmisc.h (revision 20189) +++ gtk/gtkmisc.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_MISC_H__ #define __GTK_MISC_H__ Index: gtk/gtkprinter-private.h =================================================================== --- gtk/gtkprinter-private.h (revision 20189) +++ gtk/gtkprinter-private.h (working copy) @@ -21,11 +21,9 @@ #ifndef __GTK_PRINTER_PRIVATE_H__ #define __GTK_PRINTER_PRIVATE_H__ -#include +#include #include "gtkprinter.h" -#include "gtkprintoperation.h" #include "gtkprinteroptionset.h" -#include "gtkpagesetup.h" #include "gtkprintjob.h" G_BEGIN_DECLS Index: gtk/gtktreesortable.h =================================================================== --- gtk/gtktreesortable.h (revision 20189) +++ gtk/gtktreesortable.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TREE_SORTABLE_H__ #define __GTK_TREE_SORTABLE_H__ Index: gtk/gtkprintsettings.h =================================================================== --- gtk/gtkprintsettings.h (revision 20189) +++ gtk/gtkprintsettings.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_PRINT_SETTINGS_H__ #define __GTK_PRINT_SETTINGS_H__ Index: gtk/gtklabel.h =================================================================== --- gtk/gtklabel.h (revision 20189) +++ gtk/gtklabel.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_LABEL_H__ #define __GTK_LABEL_H__ Index: gtk/gtkcellrendererprogress.h =================================================================== --- gtk/gtkcellrendererprogress.h (revision 20189) +++ gtk/gtkcellrendererprogress.h (working copy) @@ -17,6 +17,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + /* * Modified by the GTK+ Team and others 1997-2004. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog @@ -24,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 can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_PROGRESS_H__ #define __GTK_CELL_RENDERER_PROGRESS_H__ Index: gtk/gtkfilechooser.h =================================================================== --- gtk/gtkfilechooser.h (revision 20189) +++ gtk/gtkfilechooser.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_FILE_CHOOSER_H__ #define __GTK_FILE_CHOOSER_H__ Index: gtk/gtkprintoperationpreview.h =================================================================== --- gtk/gtkprintoperationpreview.h (revision 20189) +++ gtk/gtkprintoperationpreview.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_PRINT_OPERATION_PREVIEW_H__ #define __GTK_PRINT_OPERATION_PREVIEW_H__ @@ -48,7 +52,6 @@ struct _GtkPrintOperationPreviewIface GtkPrintContext *context, GtkPageSetup *page_setup); - /* methods */ void (*render_page) (GtkPrintOperationPreview *preview, gint page_nr); @@ -56,7 +59,6 @@ struct _GtkPrintOperationPreviewIface gint page_nr); void (*end_preview) (GtkPrintOperationPreview *preview); - /* Padding for future expansion */ void (*_gtk_reserved1) (void); void (*_gtk_reserved2) (void); Index: gtk/gtkvruler.h =================================================================== --- gtk/gtkvruler.h (revision 20189) +++ gtk/gtkvruler.h (working copy) @@ -34,6 +34,10 @@ * distribution. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_VRULER_H__ #define __GTK_VRULER_H__ @@ -75,4 +79,3 @@ G_END_DECLS #endif /* __GTK_VRULER_H__ */ - Index: gtk/gtkitem.h =================================================================== --- gtk/gtkitem.h (revision 20189) +++ gtk/gtkitem.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ITEM_H__ #define __GTK_ITEM_H__ Index: gtk/gtkentry.h =================================================================== --- gtk/gtkentry.h (revision 20189) +++ gtk/gtkentry.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ENTRY_H__ #define __GTK_ENTRY_H__ Index: gtk/gtkprintoperation.h =================================================================== --- gtk/gtkprintoperation.h (revision 20189) +++ gtk/gtkprintoperation.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_PRINT_OPERATION_H__ #define __GTK_PRINT_OPERATION_H__ @@ -103,7 +107,6 @@ struct _GtkPrintOperationClass void (*custom_widget_apply) (GtkPrintOperation *operation, GtkWidget *widget); - gboolean (*preview) (GtkPrintOperation *operation, GtkPrintOperationPreview *preview, GtkPrintContext *context, Index: gtk/gtkinputdialog.h =================================================================== --- gtk/gtkinputdialog.h (revision 20189) +++ gtk/gtkinputdialog.h (working copy) @@ -34,6 +34,10 @@ * distribution. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_INPUTDIALOG_H__ #define __GTK_INPUTDIALOG_H__ Index: gtk/gtkfilefilter.h =================================================================== --- gtk/gtkfilefilter.h (revision 20189) +++ gtk/gtkfilefilter.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_FILE_FILTER_H__ #define __GTK_FILE_FILTER_H__ Index: gtk/gtktooltip.h =================================================================== --- gtk/gtktooltip.h (revision 20189) +++ gtk/gtktooltip.h (working copy) @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TOOLTIP_H__ #define __GTK_TOOLTIP_H__ Index: gtk/gtkentrycompletion.h =================================================================== --- gtk/gtkentrycompletion.h (revision 20189) +++ gtk/gtkentrycompletion.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_ENTRY_COMPLETION_H__ #define __GTK_ENTRY_COMPLETION_H__ Index: gtk/gtkcelleditable.h =================================================================== --- gtk/gtkcelleditable.h (revision 20189) +++ gtk/gtkcelleditable.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_CELL_EDITABLE_H__ #define __GTK_CELL_EDITABLE_H__ Index: gtk/gtkassistant.h =================================================================== --- gtk/gtkassistant.h (revision 20189) +++ gtk/gtkassistant.h (working copy) @@ -23,6 +23,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_ASSISTANT_H__ #define __GTK_ASSISTANT_H__ Index: gtk/gtkpreview.h =================================================================== --- gtk/gtkpreview.h (revision 20189) +++ gtk/gtkpreview.h (working copy) @@ -29,8 +29,7 @@ #ifndef __GTK_PREVIEW_H__ #define __GTK_PREVIEW_H__ - -#include +#include G_BEGIN_DECLS Index: gtk/gtkgc.h =================================================================== --- gtk/gtkgc.h (revision 20189) +++ gtk/gtkgc.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_GC_H__ #define __GTK_GC_H__ Index: gtk/gtkpixmap.h =================================================================== --- gtk/gtkpixmap.h (revision 20189) +++ gtk/gtkpixmap.h (working copy) @@ -29,9 +29,7 @@ #ifndef __GTK_PIXMAP_H__ #define __GTK_PIXMAP_H__ - -#include -#include +#include G_BEGIN_DECLS Index: gtk/gtkhbbox.h =================================================================== --- gtk/gtkhbbox.h (revision 20189) +++ gtk/gtkhbbox.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_HBUTTON_BOX_H__ #define __GTK_HBUTTON_BOX_H__ Index: gtk/gtkuimanager.h =================================================================== --- gtk/gtkuimanager.h (revision 20189) +++ gtk/gtkuimanager.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_UI_MANAGER_H__ #define __GTK_UI_MANAGER_H__ Index: gtk/gtkmenuitem.h =================================================================== --- gtk/gtkmenuitem.h (revision 20189) +++ gtk/gtkmenuitem.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_MENU_ITEM_H__ #define __GTK_MENU_ITEM_H__ Index: gtk/gtkimagemenuitem.h =================================================================== --- gtk/gtkimagemenuitem.h (revision 20189) +++ gtk/gtkimagemenuitem.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_IMAGE_MENU_ITEM_H__ #define __GTK_IMAGE_MENU_ITEM_H__ Index: gtk/gtktoolitem.h =================================================================== --- gtk/gtktoolitem.h (revision 20189) +++ gtk/gtktoolitem.h (working copy) @@ -20,6 +20,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TOOL_ITEM_H__ #define __GTK_TOOL_ITEM_H__ Index: gtk/gtkclipboard.h =================================================================== --- gtk/gtkclipboard.h (revision 20189) +++ gtk/gtkclipboard.h (working copy) @@ -19,6 +19,10 @@ * Global clipboard abstraction. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_CLIPBOARD_H__ #define __GTK_CLIPBOARD_H__ Index: gtk/gtkradiomenuitem.h =================================================================== --- gtk/gtkradiomenuitem.h (revision 20189) +++ gtk/gtkradiomenuitem.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_RADIO_MENU_ITEM_H__ #define __GTK_RADIO_MENU_ITEM_H__ Index: gtk/gtkmenu.h =================================================================== --- gtk/gtkmenu.h (revision 20189) +++ gtk/gtkmenu.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_MENU_H__ #define __GTK_MENU_H__ Index: gtk/gtkrc.h =================================================================== --- gtk/gtkrc.h (revision 20189) +++ gtk/gtkrc.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_RC_H__ #define __GTK_RC_H__ Index: gtk/gtkseparatormenuitem.h =================================================================== --- gtk/gtkseparatormenuitem.h (revision 20189) +++ gtk/gtkseparatormenuitem.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_SEPARATOR_MENU_ITEM_H__ #define __GTK_SEPARATOR_MENU_ITEM_H__ Index: gtk/gtkimmodule.h =================================================================== --- gtk/gtkimmodule.h (revision 20189) +++ gtk/gtkimmodule.h (working copy) @@ -20,7 +20,7 @@ #ifndef __GTK_IM_MODULE_H__ #define __GTK_IM_MODULE_H__ -#include +#include G_BEGIN_DECLS Index: gtk/gtktexttagprivate.h =================================================================== --- gtk/gtktexttagprivate.h (revision 20189) +++ gtk/gtktexttagprivate.h (working copy) @@ -27,7 +27,7 @@ #ifndef __GTK_TEXT_TAG_PRIVATE_H__ #define __GTK_TEXT_TAG_PRIVATE_H__ -#include +#include typedef struct _GtkTextBTreeNode GtkTextBTreeNode; Index: gtk/gtkseparatortoolitem.h =================================================================== --- gtk/gtkseparatortoolitem.h (revision 20189) +++ gtk/gtkseparatortoolitem.h (working copy) @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_SEPARATOR_TOOL_ITEM_H__ #define __GTK_SEPARATOR_TOOL_ITEM_H__ Index: gtk/gtkcellrendereraccel.h =================================================================== --- gtk/gtkcellrendereraccel.h (revision 20189) +++ gtk/gtkcellrendereraccel.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_CELL_RENDERER_ACCEL_H__ #define __GTK_CELL_RENDERER_ACCEL_H__ Index: gtk/gtktoolbar.h =================================================================== --- gtk/gtktoolbar.h (revision 20189) +++ gtk/gtktoolbar.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_TOOLBAR_H__ #define __GTK_TOOLBAR_H__ Index: gtk/gtkinvisible.h =================================================================== --- gtk/gtkinvisible.h (revision 20189) +++ gtk/gtkinvisible.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_INVISIBLE_H__ #define __GTK_INVISIBLE_H__ Index: gtk/gtkmenushell.h =================================================================== --- gtk/gtkmenushell.h (revision 20189) +++ gtk/gtkmenushell.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_MENU_SHELL_H__ #define __GTK_MENU_SHELL_H__ Index: gtk/gtkaccelmap.h =================================================================== --- gtk/gtkaccelmap.h (revision 20189) +++ gtk/gtkaccelmap.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ACCEL_MAP_H__ #define __GTK_ACCEL_MAP_H__ Index: gtk/gtkcheckbutton.h =================================================================== --- gtk/gtkcheckbutton.h (revision 20189) +++ gtk/gtkcheckbutton.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_CHECK_BUTTON_H__ #define __GTK_CHECK_BUTTON_H__ Index: gtk/gtkcellrenderertext.h =================================================================== --- gtk/gtkcellrenderertext.h (revision 20189) +++ gtk/gtkcellrenderertext.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only 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_ G_END_DECLS - #endif /* __GTK_CELL_RENDERER_TEXT_H__ */ Index: gtk/gtkrecentaction.h =================================================================== --- gtk/gtkrecentaction.h (revision 20189) +++ gtk/gtkrecentaction.h (working copy) @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_RECENT_ACTION_H__ #define __GTK_RECENT_ACTION_H__ Index: gtk/gtkviewport.h =================================================================== --- gtk/gtkviewport.h (revision 20189) +++ gtk/gtkviewport.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_VIEWPORT_H__ #define __GTK_VIEWPORT_H__ Index: gtk/gtkmountoperation.h =================================================================== --- gtk/gtkmountoperation.h (revision 20189) +++ gtk/gtkmountoperation.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_MOUNT_OPERATION_H__ #define __GTK_MOUNT_OPERATION_H__ Index: gtk/gtktypeutils.h =================================================================== --- gtk/gtktypeutils.h (revision 20189) +++ gtk/gtktypeutils.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_TYPE_UTILS_H__ #define __GTK_TYPE_UTILS_H__ Index: gtk/gtkarrow.h =================================================================== --- gtk/gtkarrow.h (revision 20189) +++ gtk/gtkarrow.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ARROW_H__ #define __GTK_ARROW_H__ Index: gtk/gtkpagesetup.h =================================================================== --- gtk/gtkpagesetup.h (revision 20189) +++ gtk/gtkpagesetup.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_PAGE_SETUP_H__ #define __GTK_PAGE_SETUP_H__ Index: gtk/gtkhbox.h =================================================================== --- gtk/gtkhbox.h (revision 20189) +++ gtk/gtkhbox.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_HBOX_H__ #define __GTK_HBOX_H__ Index: gtk/gtkfilechooserwidget.h =================================================================== --- gtk/gtkfilechooserwidget.h (revision 20189) +++ gtk/gtkfilechooserwidget.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_FILE_CHOOSER_WIDGET_H__ #define __GTK_FILE_CHOOSER_WIDGET_H__ Index: gtk/gtkplug.h =================================================================== --- gtk/gtkplug.h (revision 20189) +++ gtk/gtkplug.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_PLUG_H__ #define __GTK_PLUG_H__ Index: gtk/gtklayout.h =================================================================== --- gtk/gtklayout.h (revision 20189) +++ gtk/gtklayout.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_LAYOUT_H__ #define __GTK_LAYOUT_H__ Index: gtk/gtkcontainer.h =================================================================== --- gtk/gtkcontainer.h (revision 20189) +++ gtk/gtkcontainer.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_CONTAINER_H__ #define __GTK_CONTAINER_H__ Index: gtk/gtkscalebutton.h =================================================================== --- gtk/gtkscalebutton.h (revision 20189) +++ gtk/gtkscalebutton.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_SCALE_BUTTON_H__ #define __GTK_SCALE_BUTTON_H__ Index: gtk/gtkbuildable.h =================================================================== --- gtk/gtkbuildable.h (revision 20189) +++ gtk/gtkbuildable.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_BUILDABLE_H__ #define __GTK_BUILDABLE_H__ Index: gtk/gtktextbufferrichtext.h =================================================================== --- gtk/gtktextbufferrichtext.h (revision 20189) +++ gtk/gtktextbufferrichtext.h (working copy) @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_TEXT_BUFFER_RICH_TEXT_H__ #define __GTK_TEXT_BUFFER_RICH_TEXT_H__ Index: gtk/gtkrecentchooserwidget.h =================================================================== --- gtk/gtkrecentchooserwidget.h (revision 20189) +++ gtk/gtkrecentchooserwidget.h (working copy) @@ -18,6 +18,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_RECENT_CHOOSER_WIDGET_H__ #define __GTK_RECENT_CHOOSER_WIDGET_H__ Index: gtk/gtknotebook.h =================================================================== --- gtk/gtknotebook.h (revision 20189) +++ gtk/gtknotebook.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_NOTEBOOK_H__ #define __GTK_NOTEBOOK_H__ Index: gtk/gtktreedatalist.h =================================================================== --- gtk/gtktreedatalist.h (revision 20189) +++ gtk/gtktreedatalist.h (working copy) @@ -17,13 +17,10 @@ * Boston, MA 02111-1307, USA. */ - #ifndef __GTK_TREE_DATA_LIST_H__ #define __GTK_TREE_DATA_LIST_H__ -#include -#include -#include "gtktreesortable.h" +#include typedef struct _GtkTreeDataList GtkTreeDataList; struct _GtkTreeDataList Index: gtk/gtkdebug.h =================================================================== --- gtk/gtkdebug.h (revision 20189) +++ gtk/gtkdebug.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_DEBUG_H__ #define __GTK_DEBUG_H__ Index: gtk/gtkvseparator.h =================================================================== --- gtk/gtkvseparator.h (revision 20189) +++ gtk/gtkvseparator.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_VSEPARATOR_H__ #define __GTK_VSEPARATOR_H__ Index: gtk/gtkenums.h =================================================================== --- gtk/gtkenums.h (revision 20189) +++ gtk/gtkenums.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_ENUMS_H__ #define __GTK_ENUMS_H__ Index: gtk/gtkliststore.h =================================================================== --- gtk/gtkliststore.h (revision 20189) +++ gtk/gtkliststore.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_LIST_STORE_H__ #define __GTK_LIST_STORE_H__ Index: gtk/gtkbbox.h =================================================================== --- gtk/gtkbbox.h (revision 20189) +++ gtk/gtkbbox.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_BUTTON_BOX_H__ #define __GTK_BUTTON_BOX_H__ @@ -99,5 +103,3 @@ void _gtk_button_box_child_requisition ( G_END_DECLS #endif /* __GTK_BUTTON_BOX_H__ */ - - Index: gtk/gtkcombobox.h =================================================================== --- gtk/gtkcombobox.h (revision 20189) +++ gtk/gtkcombobox.h (working copy) @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GTK_COMBO_BOX_H__ #define __GTK_COMBO_BOX_H__ Index: gtk/gtkvscrollbar.h =================================================================== --- gtk/gtkvscrollbar.h (revision 20189) +++ gtk/gtkvscrollbar.h (working copy) @@ -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 can be included directly." +#endif + #ifndef __GTK_VSCROLLBAR_H__ #define __GTK_VSCROLLBAR_H__ Index: gdk-pixbuf/gdk-pixbuf-csource.c =================================================================== --- gdk-pixbuf/gdk-pixbuf-csource.c (revision 20189) +++ gdk-pixbuf/gdk-pixbuf-csource.c (working copy) @@ -18,7 +18,9 @@ */ #include +#define __GTK_H_INSIDE__ #include "../gtk/gtkversion.h" /* versioning */ +#undef __GTK_H_INSIDE__ #include "gdk-pixbuf.h" #include "gdk-pixdata.h" #include Index: gdk-pixbuf/gdk-pixbuf-transform.h =================================================================== --- gdk-pixbuf/gdk-pixbuf-transform.h (revision 20189) +++ gdk-pixbuf/gdk-pixbuf-transform.h (working copy) @@ -23,6 +23,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef GDK_PIXBUF_TRANSFORM_H #define GDK_PIXBUF_TRANSFORM_H Index: gdk-pixbuf/gdk-pixbuf-simple-anim.h =================================================================== --- gdk-pixbuf/gdk-pixbuf-simple-anim.h (revision 20189) +++ gdk-pixbuf/gdk-pixbuf-simple-anim.h (working copy) @@ -21,6 +21,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef GDK_PIXBUF_SIMPLE_ANIM_H #define GDK_PIXBUF_SIMPLE_ANIM_H Index: gdk-pixbuf/gdk-pixbuf-loader.h =================================================================== --- gdk-pixbuf/gdk-pixbuf-loader.h (revision 20189) +++ gdk-pixbuf/gdk-pixbuf-loader.h (working copy) @@ -23,6 +23,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef GDK_PIXBUF_LOADER_H #define GDK_PIXBUF_LOADER_H Index: gdk-pixbuf/gdk-pixbuf-private.h =================================================================== --- gdk-pixbuf/gdk-pixbuf-private.h (revision 20189) +++ gdk-pixbuf/gdk-pixbuf-private.h (working copy) @@ -28,7 +28,6 @@ #define GDK_PIXBUF_PRIVATE_H #include "gdk-pixbuf.h" -#include "gdk-pixbuf-io.h" #include "gdk-pixbuf-i18n.h" #include Index: gdk-pixbuf/gdk-pixbuf-animation.h =================================================================== --- gdk-pixbuf/gdk-pixbuf-animation.h (revision 20189) +++ gdk-pixbuf/gdk-pixbuf-animation.h (working copy) @@ -24,10 +24,13 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef GDK_PIXBUF_ANIMATION_H #define GDK_PIXBUF_ANIMATION_H -#include #include #include Index: gdk-pixbuf/gdk-pixbuf-enum-types.h.template =================================================================== --- gdk-pixbuf/gdk-pixbuf-enum-types.h.template (revision 20189) +++ gdk-pixbuf/gdk-pixbuf-enum-types.h.template (working copy) @@ -1,4 +1,8 @@ /*** BEGIN file-header ***/ +#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GDK_PIXBUF_ENUM_TYPES_H__ #define __GDK_PIXBUF_ENUM_TYPES_H__ Index: gdk-pixbuf/gdk-pixbuf.h =================================================================== --- gdk-pixbuf/gdk-pixbuf.h (revision 20189) +++ gdk-pixbuf/gdk-pixbuf.h (working copy) @@ -26,6 +26,8 @@ #ifndef GDK_PIXBUF_H #define GDK_PIXBUF_H +#define GDK_PIXBUF_H_INSIDE + #include #include #include @@ -38,5 +40,6 @@ #include #include +#undef GDK_PIXBUF_H_INSIDE #endif /* GDK_PIXBUF_H */ Index: gdk-pixbuf/gdk-pixbuf-io.h =================================================================== --- gdk-pixbuf/gdk-pixbuf-io.h (revision 20189) +++ gdk-pixbuf/gdk-pixbuf-io.h (working copy) @@ -26,6 +26,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef GDK_PIXBUF_IO_H #define GDK_PIXBUF_IO_H Index: gdk-pixbuf/gdk-pixbuf-features.h.in =================================================================== --- gdk-pixbuf/gdk-pixbuf-features.h.in (revision 20189) +++ gdk-pixbuf/gdk-pixbuf-features.h.in (working copy) @@ -1,3 +1,7 @@ +#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef GDK_PIXBUF_FEATURES_H #define GDK_PIXBUF_FEATURES_H 1 Index: gdk-pixbuf/gdk-pixbuf-core.h =================================================================== --- gdk-pixbuf/gdk-pixbuf-core.h (revision 20189) +++ gdk-pixbuf/gdk-pixbuf-core.h (working copy) @@ -23,6 +23,10 @@ * Boston, MA 02111-1307, USA. */ +#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef GDK_PIXBUF_CORE_H #define GDK_PIXBUF_CORE_H Index: demos/testpixbuf.c =================================================================== --- demos/testpixbuf.c (revision 20189) +++ demos/testpixbuf.c (working copy) @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "test-inline-pixbufs.h" Index: modules/input/imcyrillic-translit.c =================================================================== --- modules/input/imcyrillic-translit.c (revision 20189) +++ modules/input/imcyrillic-translit.c (working copy) @@ -23,11 +23,11 @@ #include #include -#include +#include "gtk/gtk.h" +#include "gdk/gdkkeysyms.h" -#include "gtk/gtkintl.h" -#include "gtk/gtkimcontextsimple.h" #include "gtk/gtkimmodule.h" +#include "gtk/gtkintl.h" GType type_cyrillic_translit = 0; Index: modules/input/gtkimcontextxim.c =================================================================== --- modules/input/gtkimcontextxim.c (revision 20189) +++ modules/input/gtkimcontextxim.c (working copy) @@ -22,12 +22,10 @@ #include #include -#include "gtk/gtkintl.h" -#include "gtk/gtklabel.h" -#include "gtk/gtksignal.h" -#include "gtk/gtkwindow.h" #include "gtkimcontextxim.h" +#include "gtk/gtkintl.h" + typedef struct _StatusWindow StatusWindow; typedef struct _GtkXIMInfo GtkXIMInfo; Index: modules/input/imipa.c =================================================================== --- modules/input/imipa.c (revision 20189) +++ modules/input/imipa.c (working copy) @@ -23,11 +23,11 @@ #include #include -#include +#include "gtk/gtk.h" +#include "gdk/gdkkeysyms.h" -#include "gtk/gtkintl.h" -#include "gtk/gtkimcontextsimple.h" #include "gtk/gtkimmodule.h" +#include "gtk/gtkintl.h" GType type_ipa = 0; Index: modules/input/gtkimcontextxim.h =================================================================== --- modules/input/gtkimcontextxim.h (revision 20189) +++ modules/input/gtkimcontextxim.h (working copy) @@ -20,7 +20,7 @@ #ifndef __GTK_IM_CONTEXT_XIM_H__ #define __GTK_IM_CONTEXT_XIM_H__ -#include +#include #include "x11/gdkx.h" G_BEGIN_DECLS Index: modules/input/imti-er.c =================================================================== --- modules/input/imti-er.c (revision 20189) +++ modules/input/imti-er.c (working copy) @@ -29,11 +29,11 @@ #include #include -#include +#include "gtk/gtk.h" +#include "gdk/gdkkeysyms.h" -#include "gtk/gtkintl.h" -#include "gtk/gtkimcontextsimple.h" #include "gtk/gtkimmodule.h" +#include "gtk/gtkintl.h" GType type_ti_er_translit = 0; Index: modules/input/imviqr.c =================================================================== --- modules/input/imviqr.c (revision 20189) +++ modules/input/imviqr.c (working copy) @@ -26,11 +26,11 @@ #include #include -#include +#include "gtk/gtk.h" +#include "gdk/gdkkeysyms.h" -#include "gtk/gtkintl.h" -#include "gtk/gtkimcontextsimple.h" #include "gtk/gtkimmodule.h" +#include "gtk/gtkintl.h" GType type_viqr_translit = 0; Index: modules/input/gtkimcontextmultipress.c =================================================================== --- modules/input/gtkimcontextmultipress.c (revision 20189) +++ modules/input/gtkimcontextmultipress.c (working copy) @@ -16,17 +16,15 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + +#include + +#include "gtk/gtk.h" +#include "gdk/gdkkeysyms.h" + +#include "gtk/gtkimmodule.h" #include "gtkimcontextmultipress.h" -#include -#include -#include -#include -#include -#include -#include /* For GDK_A, etc. */ -#include /* For GKeyFile */ -#include -#include /* For memset() */ #define AUTOMATIC_COMPOSE_TIMEOUT 1 /* seconds */ Index: modules/input/imti-et.c =================================================================== --- modules/input/imti-et.c (revision 20189) +++ modules/input/imti-et.c (working copy) @@ -29,11 +29,11 @@ #include #include -#include +#include "gtk/gtk.h" +#include "gdk/gdkkeysyms.h" -#include "gtk/gtkintl.h" -#include "gtk/gtkimcontextsimple.h" #include "gtk/gtkimmodule.h" +#include "gtk/gtkintl.h" GType type_ti_et_translit = 0; Index: modules/input/gtkimcontextime.c =================================================================== --- modules/input/gtkimcontextime.c (revision 20189) +++ modules/input/gtkimcontextime.c (working copy) @@ -31,7 +31,6 @@ #include "gdk/win32/gdkwin32.h" #include "gdk/gdkkeysyms.h" -#include "gtk/gtkwidget.h" #include Index: modules/input/gtkimcontextmultipress.h =================================================================== --- modules/input/gtkimcontextmultipress.h (revision 20189) +++ modules/input/gtkimcontextmultipress.h (working copy) @@ -19,7 +19,7 @@ #ifndef __GTK_IM_CONTEXT_MULTIPRESS_H #define __GTK_IM_CONTEXT_MULTIPRESS_H -#include +#include G_BEGIN_DECLS Index: modules/input/gtkimcontextime.h =================================================================== --- modules/input/gtkimcontextime.h (revision 20189) +++ modules/input/gtkimcontextime.h (working copy) @@ -21,7 +21,7 @@ * $Id$ */ -#include +#include extern GType gtk_type_im_context_ime; Index: modules/input/imcedilla.c =================================================================== --- modules/input/imcedilla.c (revision 20189) +++ modules/input/imcedilla.c (working copy) @@ -23,11 +23,12 @@ #include #include -#include +#include "gtk/gtk.h" +#include "gdk/gdkkeysyms.h" -#include "gtk/gtkintl.h" -#include "gtk/gtkimcontextsimple.h" #include "gtk/gtkimmodule.h" +#include "gtk/gtkintl.h" + GType type_cedilla = 0; Index: modules/input/iminuktitut.c =================================================================== --- modules/input/iminuktitut.c (revision 20189) +++ modules/input/iminuktitut.c (working copy) @@ -26,11 +26,11 @@ #include #include -#include +#include "gtk/gtk.h" +#include "gdk/gdkkeysyms.h" -#include "gtk/gtkintl.h" -#include "gtk/gtkimcontextsimple.h" #include "gtk/gtkimmodule.h" +#include "gtk/gtkintl.h" GType type_inuktitut_translit = 0; Index: modules/input/imam-et.c =================================================================== --- modules/input/imam-et.c (revision 20189) +++ modules/input/imam-et.c (working copy) @@ -29,11 +29,11 @@ #include #include +#include #include -#include "gtk/gtkintl.h" -#include "gtk/gtkimcontextsimple.h" #include "gtk/gtkimmodule.h" +#include "gtk/gtkintl.h" GType type_am_et_translit = 0; Index: modules/input/gtkimcontextthai.h =================================================================== --- modules/input/gtkimcontextthai.h (revision 20189) +++ modules/input/gtkimcontextthai.h (working copy) @@ -22,7 +22,7 @@ #ifndef __GTK_IM_CONTEXT_THAI_H__ #define __GTK_IM_CONTEXT_THAI_H__ -#include +#include G_BEGIN_DECLS Index: modules/other/gail/gailsubmenuitem.h =================================================================== --- modules/other/gail/gailsubmenuitem.h (revision 20189) +++ modules/other/gail/gailsubmenuitem.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_SUB_MENU_ITEM_H__ #define __GAIL_SUB_MENU_ITEM_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailmenu.c =================================================================== --- modules/other/gail/gailmenu.c (revision 20189) +++ modules/other/gail/gailmenu.c (working copy) @@ -19,10 +19,6 @@ #include -#include -#include -#include -#include #include "gailmenu.h" static void gail_menu_class_init (GailMenuClass *klass); Index: modules/other/gail/gailcombo.h =================================================================== --- modules/other/gail/gailcombo.h (revision 20189) +++ modules/other/gail/gailcombo.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_COMBO_H__ #define __GAIL_COMBO_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailentry.h =================================================================== --- modules/other/gail/gailentry.h (revision 20189) +++ modules/other/gail/gailentry.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_ENTRY_H__ #define __GAIL_ENTRY_H__ -#include #include #include Index: modules/other/gail/gailmenu.h =================================================================== --- modules/other/gail/gailmenu.h (revision 20189) +++ modules/other/gail/gailmenu.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_MENU_H__ #define __GAIL_MENU_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailexpander.h =================================================================== --- modules/other/gail/gailexpander.h (revision 20189) +++ modules/other/gail/gailexpander.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_EXPANDER_H__ #define __GAIL_EXPANDER_H__ -#include #include #include Index: modules/other/gail/gailwindow.h =================================================================== --- modules/other/gail/gailwindow.h (revision 20189) +++ modules/other/gail/gailwindow.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_WINDOW_H__ #define __GAIL_WINDOW_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gaillist.h =================================================================== --- modules/other/gail/gaillist.h (revision 20189) +++ modules/other/gail/gaillist.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_LIST_H__ #define __GAIL_LIST_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailradiosubmenuitem.h =================================================================== --- modules/other/gail/gailradiosubmenuitem.h (revision 20189) +++ modules/other/gail/gailradiosubmenuitem.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_RADIO_SUB_MENU_ITEM_H__ #define __GAIL_RADIO_SUB_MENU_ITEM_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailtextview.h =================================================================== --- modules/other/gail/gailtextview.h (revision 20189) +++ modules/other/gail/gailtextview.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_TEXT_VIEW_H__ #define __GAIL_TEXT_VIEW_H__ -#include #include #include Index: modules/other/gail/gailimagecell.h =================================================================== Index: modules/other/gail/gailimage.h =================================================================== --- modules/other/gail/gailimage.h (revision 20189) +++ modules/other/gail/gailimage.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_IMAGE_H__ #define __GAIL_IMAGE_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailtreeview.c =================================================================== --- modules/other/gail/gailtreeview.c (revision 20189) +++ modules/other/gail/gailtreeview.c (working copy) @@ -24,7 +24,6 @@ #ifdef GDK_WINDOWING_X11 #include #endif -#include #include "gailtreeview.h" #include "gailrenderercell.h" #include "gailbooleancell.h" Index: modules/other/gail/gailmenushell.h =================================================================== --- modules/other/gail/gailmenushell.h (revision 20189) +++ modules/other/gail/gailmenushell.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_MENU_SHELL_H__ #define __GAIL_MENU_SHELL_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailoptionmenu.h =================================================================== --- modules/other/gail/gailoptionmenu.h (revision 20189) +++ modules/other/gail/gailoptionmenu.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_OPTION_MENU_H__ #define __GAIL_OPTION_MENU_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailitem.h =================================================================== --- modules/other/gail/gailitem.h (revision 20189) +++ modules/other/gail/gailitem.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_ITEM_H__ #define __GAIL_ITEM_H__ -#include #include #include Index: modules/other/gail/gailpixmap.h =================================================================== --- modules/other/gail/gailpixmap.h (revision 20189) +++ modules/other/gail/gailpixmap.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_PIXMAP_H__ #define __GAIL_PIXMAP_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailscrolledwindow.h =================================================================== --- modules/other/gail/gailscrolledwindow.h (revision 20189) +++ modules/other/gail/gailscrolledwindow.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_SCROLLED_WINDOW_H__ #define __GAIL_SCROLLED_WINDOW_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailseparator.h =================================================================== --- modules/other/gail/gailseparator.h (revision 20189) +++ modules/other/gail/gailseparator.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_SEPARATOR_H__ #define __GAIL_SEPARATOR_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailspinbutton.h =================================================================== --- modules/other/gail/gailspinbutton.h (revision 20189) +++ modules/other/gail/gailspinbutton.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_SPIN_BUTTON_H__ #define __GAIL_SPIN_BUTTON_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailcalendar.h =================================================================== --- modules/other/gail/gailcalendar.h (revision 20189) +++ modules/other/gail/gailcalendar.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_CALENDAR_H__ #define __GAIL_CALENDAR_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailbutton.h =================================================================== --- modules/other/gail/gailbutton.h (revision 20189) +++ modules/other/gail/gailbutton.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_BUTTON_H__ #define __GAIL_BUTTON_H__ -#include #include #include Index: modules/other/gail/gailcheckmenuitem.c =================================================================== --- modules/other/gail/gailcheckmenuitem.c (revision 20189) +++ modules/other/gail/gailcheckmenuitem.c (working copy) @@ -20,7 +20,6 @@ #include #include -#include #include "gailcheckmenuitem.h" #include "gailchecksubmenuitem.h" Index: modules/other/gail/gailnotebookpage.h =================================================================== --- modules/other/gail/gailnotebookpage.h (revision 20189) +++ modules/other/gail/gailnotebookpage.h (working copy) @@ -20,8 +20,6 @@ #ifndef __GAIL_NOTEBOOK_PAGE_H__ #define __GAIL_NOTEBOOK_PAGE_H__ -#include -#include #include #include Index: modules/other/gail/gailnotebook.h =================================================================== --- modules/other/gail/gailnotebook.h (revision 20189) +++ modules/other/gail/gailnotebook.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_NOTEBOOK_H__ #define __GAIL_NOTEBOOK_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailcheckmenuitem.h =================================================================== --- modules/other/gail/gailcheckmenuitem.h (revision 20189) +++ modules/other/gail/gailcheckmenuitem.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_CHECK_MENU_ITEM_H__ #define __GAIL_CHECK_MENU_ITEM_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailscrollbar.h =================================================================== --- modules/other/gail/gailscrollbar.h (revision 20189) +++ modules/other/gail/gailscrollbar.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_SCROLLBAR_H__ #define __GAIL_SCROLLBAR_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailwidget.h =================================================================== --- modules/other/gail/gailwidget.h (revision 20189) +++ modules/other/gail/gailwidget.h (working copy) @@ -20,7 +20,7 @@ #ifndef __GAIL_WIDGET_H__ #define __GAIL_WIDGET_H__ -#include +#include G_BEGIN_DECLS Index: modules/other/gail/gailcellparent.c =================================================================== --- modules/other/gail/gailcellparent.c (revision 20189) +++ modules/other/gail/gailcellparent.c (working copy) @@ -20,7 +20,7 @@ #include -#include +#include #include "gailcellparent.h" GType Index: modules/other/gail/gailscale.h =================================================================== --- modules/other/gail/gailscale.h (revision 20189) +++ modules/other/gail/gailscale.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_SCALE_H__ #define __GAIL_SCALE_H__ -#include #include #include Index: modules/other/gail/gailframe.h =================================================================== --- modules/other/gail/gailframe.h (revision 20189) +++ modules/other/gail/gailframe.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_FRAME_H__ #define __GAIL_FRAME_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailcombobox.h =================================================================== --- modules/other/gail/gailcombobox.h (revision 20189) +++ modules/other/gail/gailcombobox.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_COMBO_BOX_H__ #define __GAIL_COMBO_BOX_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailtogglebutton.h =================================================================== --- modules/other/gail/gailtogglebutton.h (revision 20189) +++ modules/other/gail/gailtogglebutton.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_TOGGLE_BUTTON_H__ #define __GAIL_TOGGLE_BUTTON_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailclist.h =================================================================== --- modules/other/gail/gailclist.h (revision 20189) +++ modules/other/gail/gailclist.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_CLIST_H__ #define __GAIL_CLIST_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gaillabel.h =================================================================== --- modules/other/gail/gaillabel.h (revision 20189) +++ modules/other/gail/gaillabel.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_LABEL_H__ #define __GAIL_LABEL_H__ -#include #include #include Index: modules/other/gail/gailpaned.h =================================================================== --- modules/other/gail/gailpaned.h (revision 20189) +++ modules/other/gail/gailpaned.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_PANED_H__ #define __GAIL_PANED_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailarrow.h =================================================================== --- modules/other/gail/gailarrow.h (revision 20189) +++ modules/other/gail/gailarrow.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_ARROW_H__ #define __GAIL_ARROW_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailradiobutton.h =================================================================== --- modules/other/gail/gailradiobutton.h (revision 20189) +++ modules/other/gail/gailradiobutton.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_RADIO_BUTTON_H__ #define __GAIL_RADIO_BUTTON_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailrange.h =================================================================== --- modules/other/gail/gailrange.h (revision 20189) +++ modules/other/gail/gailrange.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_RANGE_H__ #define __GAIL_RANGE_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailradiomenuitem.h =================================================================== --- modules/other/gail/gailradiomenuitem.h (revision 20189) +++ modules/other/gail/gailradiomenuitem.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_RADIO_MENU_ITEM_H__ #define __GAIL_RADIO_MENU_ITEM_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailstatusbar.h =================================================================== --- modules/other/gail/gailstatusbar.h (revision 20189) +++ modules/other/gail/gailstatusbar.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_STATUSBAR_H__ #define __GAIL_STATUSBAR_H__ -#include #include #include Index: modules/other/gail/gailcontainer.h =================================================================== --- modules/other/gail/gailcontainer.h (revision 20189) +++ modules/other/gail/gailcontainer.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_CONTAINER_H__ #define __GAIL_CONTAINER_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailmenuitem.h =================================================================== --- modules/other/gail/gailmenuitem.h (revision 20189) +++ modules/other/gail/gailmenuitem.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_MENU_ITEM_H__ #define __GAIL_MENU_ITEM_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailbox.h =================================================================== --- modules/other/gail/gailbox.h (revision 20189) +++ modules/other/gail/gailbox.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_BOX_H__ #define __GAIL_BOX_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailprogressbar.h =================================================================== --- modules/other/gail/gailprogressbar.h (revision 20189) +++ modules/other/gail/gailprogressbar.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_PROGRESS_BAR_H__ #define __GAIL_PROGRESS_BAR_H__ -#include #include G_BEGIN_DECLS Index: modules/other/gail/gailchecksubmenuitem.h =================================================================== --- modules/other/gail/gailchecksubmenuitem.h (revision 20189) +++ modules/other/gail/gailchecksubmenuitem.h (working copy) @@ -20,7 +20,6 @@ #ifndef __GAIL_CHECK_SUB_MENU_ITEM_H__ #define __GAIL_CHECK_SUB_MENU_ITEM_H__ -#include #include G_BEGIN_DECLS Index: modules/printbackends/file/gtkprintbackendfile.c =================================================================== --- module