define __GDK_H_INSIDE__ around including all other headers.

2008-05-28  Michael Natterer  <mitch@imendio.com>

	* gdk/gdk.h: define __GDK_H_INSIDE__ around including all other
	headers.

	* gdk/gdkenumtypes.h.template
	* gdk/gdk*.h: add single-include guards that #error out if
	GTK_DISABLE_SINGLE_INCLUDES is defined and any of these files is
	included individually. Also removed some redundant includes and
	did some tiny trailing whitespace removal that's not worth to
	commit separately.

	* gdk/gdkprivate.h: include <gdk/gdk.h> instead of individual
	files.

	* gdk/win32/gdkwin32.h
	* gdk/x11/gdkx.h: only include <gdk/gdkprivate.h> and remove all
	other includes.

svn path=/trunk/; revision=20217

diff --git a/ChangeLog b/ChangeLog
index 963565bbf6383d5034de97a1241fdba2277ce68d..b7f90425fdb415602beb995ddf130baafc1bb2b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2008-05-28  Michael Natterer  <mitch@imendio.com>
+
+       * gdk/gdk.h: define __GDK_H_INSIDE__ around including all other
+       headers.
+
+       * gdk/gdkenumtypes.h.template
+       * gdk/gdk*.h: add single-include guards that #error out if
+       GTK_DISABLE_SINGLE_INCLUDES is defined and any of these files is
+       included individually. Also removed some redundant includes and
+       did some tiny trailing whitespace removal that's not worth to
+       commit separately.
+
+       * gdk/gdkprivate.h: include <gdk/gdk.h> instead of individual
+       files.
+
+       * gdk/win32/gdkwin32.h
+       * gdk/x11/gdkx.h: only include <gdk/gdkprivate.h> and remove all
+       other includes.
+
 2008-05-28  Kristian Rietveld  <kris@imendio.com>
 
        Bug 504087 - make gtk_tooltip_set_custom a no-op for setting the

diff --git a/gdk/gdk.h b/gdk/gdk.h
index b661d7a478e33b128b20049878b0a252c0d1687e..b81d48839ad7e3b5f2b30ee7f5128ce95bb32e17 100644 (file)
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -27,6 +27,8 @@
 #ifndef __GDK_H__
 #define __GDK_H__
 
+#define __GDK_H_INSIDE__
+
 #include <gdk/gdkapplaunchcontext.h>
 #include <gdk/gdkcairo.h>
 #include <gdk/gdkcolor.h>
@@ -56,6 +58,8 @@
 #include <gdk/gdkvisual.h>
 #include <gdk/gdkwindow.h>
 
+#undef __GDK_H_INSIDE__
+
 G_BEGIN_DECLS
 
 

diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 806125b6309f34f733a6c05e22c4294214717cb6..31b473070db0f98de3b2c6a3091520ccafb24c11 100644 (file)
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -20,6 +20,10 @@
    Author: Alexander Larsson <alexl@redhat.com>
 */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_APP_LAUNCH_CONTEXT_H__
 #define __GDK_APP_LAUNCH_CONTEXT_H__
 

diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h
index 19c954d46fea4c18f1a4257b7a35fec7d1c1c94e..70d79de88221187d75fb1813245a5dee3a6c884b 100644 (file)
--- a/gdk/gdkcairo.h
+++ b/gdk/gdkcairo.h
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_CAIRO_H__
 #define __GDK_CAIRO_H__
 

diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h
index 9ce33f53346467793be2939dddce50cefc7501c8..54fc3015c3e756c573a42c5caf44350aaa3071aa 100644 (file)
--- a/gdk/gdkcolor.h
+++ b/gdk/gdkcolor.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_COLOR_H__
 #define __GDK_COLOR_H__
 

diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index 7eaa9cae6baa8f784b9e5af66fab7a8f120f699b..488faa498f3711dcd288d418b91373a4fd46d154 100644 (file)
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_CURSOR_H__
 #define __GDK_CURSOR_H__
 

diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index f2eef22535c54402434c6eaac70d5cdd333a295c..04bf1831bbfc48c817d705989f2ee0fa3b031fc3 100644 (file)
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -21,12 +21,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_DISPLAY_H__
 #define __GDK_DISPLAY_H__
 
 #include <gdk/gdktypes.h>
 #include <gdk/gdkevents.h>
-#include <glib-object.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkdisplaymanager.h b/gdk/gdkdisplaymanager.h
index 7529441728b032e6b4473c9dadb5525078e54a1e..eef441f25869dc098d02f3f1343da177cea4e9f3 100644 (file)
--- a/gdk/gdkdisplaymanager.h
+++ b/gdk/gdkdisplaymanager.h
@@ -24,6 +24,10 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_DISPLAY_MANAGER_H__
 #define __GDK_DISPLAY_MANAGER_H__
 

diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index 684405320d2e2f4045f8ff8081b57ee565ba58c0..ae8362fbd629866af5aae16f7d337b3e19d8d9e8 100644 (file)
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -21,8 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_DND_H__
 #define __GDK_DND_H__
 

diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index bbd6a4dc37b34695746f2c13b4b0e37ee8ecb370..508bf86fcfd2027816c687c524dd2c471a566dd1 100644 (file)
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -21,8 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_DRAWABLE_H__
 #define __GDK_DRAWABLE_H__
 

diff --git a/gdk/gdkenumtypes.h.template b/gdk/gdkenumtypes.h.template
index 51b82940f9425a92bd0e569e0daf89ca2d7e06fb..5677106b238432e4d484e342b908c9878b455463 100644 (file)
--- a/gdk/gdkenumtypes.h.template
+++ b/gdk/gdkenumtypes.h.template
@@ -1,4 +1,8 @@
 /*** BEGIN file-header ***/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_ENUM_TYPES_H__
 #define __GDK_ENUM_TYPES_H__
 

diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index ba2c82ac8f5945515508e10072ce79ce07bd791f..87cc83734069256e6877fa956f9bc6d695236f89 100644 (file)
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_EVENTS_H__
 #define __GDK_EVENTS_H__
 

diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h
index 70be9875b33cb538fd6bd345dd592718be166380..ff0460504fba14957215f4875128af0b7693d798 100644 (file)
--- a/gdk/gdkgc.h
+++ b/gdk/gdkgc.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_GC_H__
 #define __GDK_GC_H__
 

diff --git a/gdk/gdkimage.h b/gdk/gdkimage.h
index 5b8303be6b382b3d7391702f1cb832f25b7146a2..1c3c40176c38f01d0c942e680c686aba2ea6bbc8 100644 (file)
--- a/gdk/gdkimage.h
+++ b/gdk/gdkimage.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_IMAGE_H__
 #define __GDK_IMAGE_H__
 

diff --git a/gdk/gdkinput.h b/gdk/gdkinput.h
index d5fe003d7ec536835b38cb047b34730f4d8ff6fb..454def8f2b74dfbdc58470c50ff975329e4452da 100644 (file)
--- a/gdk/gdkinput.h
+++ b/gdk/gdkinput.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_INPUT_H__
 #define __GDK_INPUT_H__
 

diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index fda2997e53b265d2da56c55c929f78392b206a86..839cbe765bd5221d452b792ba837420c7c92b3b1 100644 (file)
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -24,6 +24,10 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_KEYS_H__
 #define __GDK_KEYS_H__
 

diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index ce6bf848f68b4595b49623aa6a1b0ad9b5af7335..39df0ef4d14f7479e5eccaa28fa2ff27727435a1 100644 (file)
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_PANGO_H__
 #define __GDK_PANGO_H__
 

diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h
index 7ec7164451edf9942e38b9f336a88fbf27dedf1b..e6cd09a36eedcc311d65d1e64bcc5959a2db625e 100644 (file)
--- a/gdk/gdkpixbuf.h
+++ b/gdk/gdkpixbuf.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_PIXBUF_H__
 #define __GDK_PIXBUF_H__
 

diff --git a/gdk/gdkpixmap.h b/gdk/gdkpixmap.h
index 1f9190b48948c500ea4508b0975ecee315916408..e30903891583360547f64ca7bfd900bd3393e49c 100644 (file)
--- a/gdk/gdkpixmap.h
+++ b/gdk/gdkpixmap.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_PIXMAP_H__
 #define __GDK_PIXMAP_H__
 

diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index 95af2e151f9f11e83fe4090ac6e0bed5332fd40a..031fe9ae7f589c92e885483574202fe7738efc91 100644 (file)
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -27,14 +27,7 @@
 #ifndef __GDK_PRIVATE_H__
 #define __GDK_PRIVATE_H__
 
-#include <gdk/gdktypes.h>
-#include <gdk/gdkevents.h>
-#include <gdk/gdkfont.h>
-#include <gdk/gdkgc.h>
-#include <gdk/gdkimage.h>
-#include <gdk/gdkregion.h>
-#include <gdk/gdkvisual.h>
-#include <gdk/gdkwindow.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkproperty.h b/gdk/gdkproperty.h
index 81b6c540b7e623916561028291fb60fb5fe61c1d..3cfda50191605d1f14455f7d7f9a02cb34b83cd1 100644 (file)
--- a/gdk/gdkproperty.h
+++ b/gdk/gdkproperty.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_PROPERTY_H__
 #define __GDK_PROPERTY_H__
 

diff --git a/gdk/gdkregion.h b/gdk/gdkregion.h
index e2c1a765606170bfbcfaec64225d67fdcdda510b..b7381eaf4dccc6b0af07d3996b37087191744c35 100644 (file)
--- a/gdk/gdkregion.h
+++ b/gdk/gdkregion.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_REGION_H__
 #define __GDK_REGION_H__
 

diff --git a/gdk/gdkrgb.h b/gdk/gdkrgb.h
index cc3d5153065312c97883842e2fdff0ba27ec7f20..2f615865b9fab1cf2dc451a5ae972023ce37f788 100644 (file)
--- a/gdk/gdkrgb.h
+++ b/gdk/gdkrgb.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_RGB_H__
 #define __GDK_RGB_H__
 

diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index c89990335d42904d7700b5060c36c851184ac654..b1f3b8e8a7fb908c53b060333284d149acf1f09c 100644 (file)
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -21,6 +21,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_SCREEN_H__
 #define __GDK_SCREEN_H__
 

diff --git a/gdk/gdkselection.h b/gdk/gdkselection.h
index 1787c8e50f684f00ddcd239ead3b32ded32af678..8b8f008dc08dc7ce682d7c3dd6005e8b42336a65 100644 (file)
--- a/gdk/gdkselection.h
+++ b/gdk/gdkselection.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_SELECTION_H__
 #define __GDK_SELECTION_H__
 

diff --git a/gdk/gdkspawn.h b/gdk/gdkspawn.h
index 745a1f806b9bd980e1bb08c77e35d4999ae370c2..ff8c1e4c8c3880cab9a92661d8c58c91df2877b3 100644 (file)
--- a/gdk/gdkspawn.h
+++ b/gdk/gdkspawn.h
@@ -19,6 +19,10 @@
  * Authors: Mark McLoughlin <mark@skynet.ie>
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_SPAWN_H__
 #define __GDK_SPAWN_H__
 

diff --git a/gdk/gdktestutils.h b/gdk/gdktestutils.h
index 647a5dcb1369203a8198029569e195e4d1077f31..fb13886ad8de6ee3a00b562ad6f7760eb2f065d7 100644 (file)
--- a/gdk/gdktestutils.h
+++ b/gdk/gdktestutils.h
@@ -17,6 +17,11 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_TEST_UTILS_H__
 #define __GDK_TEST_UTILS_H__
 
@@ -38,6 +43,7 @@ gboolean        gdk_test_simulate_button        (GdkWindow      *window,
                                                  guint           button, /*1..3*/
                                                  GdkModifierType modifiers,
                                                  GdkEventType    button_pressrelease);
+
 G_END_DECLS
 
 #endif /* __GDK_TEST_UTILS_H__ */

diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 648bb40e3967075f5a6c80b91b6b23b94fdb4d8d..06a7aa06274ebae59ade70ee27d0f56e97c85efe 100644 (file)
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_TYPES_H__
 #define __GDK_TYPES_H__
 

diff --git a/gdk/gdkvisual.h b/gdk/gdkvisual.h
index e49439f45ff01c319ed5186d75ae0f383afad042..d9479a5dccc8520d7888bf16048454c22a1ad466 100644 (file)
--- a/gdk/gdkvisual.h
+++ b/gdk/gdkvisual.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_VISUAL_H__
 #define __GDK_VISUAL_H__
 

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index b29428a2a31fcf9f41252e68028a588b9f8aaedb..06ee0181e7a9c0d52bb226f9ff72f7f7debcf621 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -21,9 +21,13 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_WINDOW_H__
 #define __GDK_WINDOW_H__
 

diff --git a/gdk/win32/gdkwin32.h b/gdk/win32/gdkwin32.h
index 06ff05596c44664a557e252a6ab62682f8fafd18..c89c90e453bdbcedd23ba814d8f8f6b3677542e5 100644 (file)
--- a/gdk/win32/gdkwin32.h
+++ b/gdk/win32/gdkwin32.h
@@ -28,7 +28,6 @@
 #define __GDK_WIN32_H__
 
 #include <gdk/gdkprivate.h>
-#include <gdk/gdkcursor.h>
 
 #ifndef STRICT
 #define STRICT                 /* We want strict type checks */

diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 64185f82888af71c027eb6340da69e774bc09dff..baa395d392f569f40e3dbf723cd697ae96da6895 100644 (file)
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -28,7 +28,6 @@
 #define __GDK_X_H__
 
 #include <gdk/gdkprivate.h>
-#include <gdk/gdkcursor.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>