Remove all traces of GDK_PIXBUF/GTK_DISABLE_SINGLE_INCLUDES

...and disallow inclusion of individual files unconditionally.
2024-11-06 00:30:08 +00:00 · 2009-10-21 20:30:04 +02:00 · 2009-10-21 20:30:04 +02:00 · 5e29973773
commit 5e29973773
parent 90d514a8a5
208 changed files with 208 additions and 208 deletions
--- a/configure.in
+++ b/configure.in
@ -337,7 +337,7 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl

-CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES"

 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.
--- a/gdk-pixbuf/gdk-pixbuf-animation.h
+++ b/gdk-pixbuf/gdk-pixbuf-animation.h
@ -24,7 +24,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#if !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif

--- a/gdk-pixbuf/gdk-pixbuf-core.h
+++ b/gdk-pixbuf/gdk-pixbuf-core.h
@ -23,7 +23,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#if !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif

--- a/gdk-pixbuf/gdk-pixbuf-io.h
+++ b/gdk-pixbuf/gdk-pixbuf-io.h
@ -26,7 +26,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#if !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif

--- a/gdk-pixbuf/gdk-pixbuf-loader.h
+++ b/gdk-pixbuf/gdk-pixbuf-loader.h
@ -23,7 +23,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#if !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif

--- a/gdk-pixbuf/gdk-pixbuf-simple-anim.h
+++ b/gdk-pixbuf/gdk-pixbuf-simple-anim.h
@ -21,7 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#if !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif

--- a/gdk-pixbuf/gdk-pixbuf-transform.h
+++ b/gdk-pixbuf/gdk-pixbuf-transform.h
@ -23,7 +23,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) && !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
+#if !defined (GDK_PIXBUF_H_INSIDE) && !defined (GDK_PIXBUF_COMPILATION)
 #error "Only <gdk-pixbuf/gdk-pixbuf.h> can be included directly."
 #endif

--- a/gdk/gdkcairo.h
+++ b/gdk/gdkcairo.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkcolor.h
+++ b/gdk/gdkcolor.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@ -21,7 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkdisplaymanager.h
+++ b/gdk/gdkdisplaymanager.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkgc.h
+++ b/gdk/gdkgc.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkimage.h
+++ b/gdk/gdkimage.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkinput.h
+++ b/gdk/gdkinput.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkpixbuf.h
+++ b/gdk/gdkpixbuf.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkpixmap.h
+++ b/gdk/gdkpixmap.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkproperty.h
+++ b/gdk/gdkproperty.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkregion.h
+++ b/gdk/gdkregion.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkrgb.h
+++ b/gdk/gdkrgb.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@ -21,7 +21,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkselection.h
+++ b/gdk/gdkselection.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkspawn.h
+++ b/gdk/gdkspawn.h
@ -19,7 +19,7 @@
 * Authors: Mark McLoughlin <mark@skynet.ie>
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkvisual.h
+++ b/gdk/gdkvisual.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif

--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@ -22,7 +22,7 @@
   Author: Anders Carlsson <andersca@codefactory.se>
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@ -27,7 +27,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkaccelmap.h
+++ b/gtk/gtkaccelmap.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkaccessible.h
+++ b/gtk/gtkaccessible.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@ -28,7 +28,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@ -28,7 +28,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkactivatable.h
+++ b/gtk/gtkactivatable.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkarrow.h
+++ b/gtk/gtkarrow.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@ -23,7 +23,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkbbox.h
+++ b/gtk/gtkbbox.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@ -27,7 +27,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@ -18,7 +18,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@ -18,7 +18,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@ -26,7 +26,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcelleditable.h
+++ b/gtk/gtkcelleditable.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcelllayout.h
+++ b/gtk/gtkcelllayout.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcellrendereraccel.h
+++ b/gtk/gtkcellrendereraccel.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcellrenderercombo.h
+++ b/gtk/gtkcellrenderercombo.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcellrendererpixbuf.h
+++ b/gtk/gtkcellrendererpixbuf.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcellrendererprogress.h
+++ b/gtk/gtkcellrendererprogress.h
@ -25,7 +25,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcellrendererspin.h
+++ b/gtk/gtkcellrendererspin.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcellrenderertoggle.h
+++ b/gtk/gtkcellrenderertoggle.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcheckbutton.h
+++ b/gtk/gtkcheckbutton.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@ -19,7 +19,7 @@
 * Global clipboard abstraction.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@ -29,7 +29,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcolorsel.h
+++ b/gtk/gtkcolorsel.h
@ -25,7 +25,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcolorseldialog.h
+++ b/gtk/gtkcolorseldialog.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcomboboxentry.h
+++ b/gtk/gtkcomboboxentry.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@ -25,7 +25,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@ -28,7 +28,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkentrybuffer.h
+++ b/gtk/gtkentrybuffer.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkentrycompletion.h
+++ b/gtk/gtkentrycompletion.h
@ -17,7 +17,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkeventbox.h
+++ b/gtk/gtkeventbox.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@ -21,7 +21,7 @@
 *	Mark McLoughlin <mark@skynet.ie>
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkfilechooser.h
+++ b/gtk/gtkfilechooser.h
@ -18,7 +18,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkfilechooserbutton.h
+++ b/gtk/gtkfilechooserbutton.h
@ -18,7 +18,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkfilechooserdialog.h
+++ b/gtk/gtkfilechooserdialog.h
@ -18,7 +18,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkfilechooserwidget.h
+++ b/gtk/gtkfilechooserwidget.h
@ -18,7 +18,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@ -18,7 +18,7 @@
 * Boston, MA 02111-1307, USA.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkfontbutton.h
+++ b/gtk/gtkfontbutton.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@ -28,7 +28,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkgc.h
+++ b/gtk/gtkgc.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkhandlebox.h
+++ b/gtk/gtkhandlebox.h
@ -29,7 +29,7 @@
 * their parents.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkhbbox.h
+++ b/gtk/gtkhbbox.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkhbox.h
+++ b/gtk/gtkhbox.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkhpaned.h
+++ b/gtk/gtkhpaned.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkhruler.h
+++ b/gtk/gtkhruler.h
@ -34,7 +34,7 @@
 * distribution.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkhscale.h
+++ b/gtk/gtkhscale.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/gtk/gtkhscrollbar.h
+++ b/gtk/gtkhscrollbar.h
@ -24,7 +24,7 @@
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
 */

-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif

--- a/Show More
+++ b/Show More