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
2008-05-28 14:01:57 +00:00 · 2008-05-28 14:01:57 +00:00 · 791ac426d7
commit 791ac426d7
parent 382ce2f138
32 changed files with 153 additions and 28 deletions
--- a/19
+++ b/19
@ -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
--- 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


--- 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__

--- 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__

--- 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__

--- 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__

--- 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

--- 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__

--- 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__

--- 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__

--- 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__

--- 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__

--- 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__

--- 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__

--- 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__

--- 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__

--- 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__

--- 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__

--- 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__

--- 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

--- 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__

--- 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__

--- 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__

--- 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__

--- 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__

--- 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__

--- 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__ */
--- 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__

--- 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__

--- 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__

--- 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 */
--- 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>