AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

define __GDK_H_INSIDE__ around including all other headers.

Browse Source 
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
This commit is contained in:
Michael Natterer 2008-05-28 14:01:57 +00:00 committed by Michael Natterer
parent 382ce2f138
commit 791ac426d7
32 changed files with 153 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -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> 2008-05-28 Kristian Rietveld <kris@imendio.com>
Bug 504087 - make gtk_tooltip_set_custom a no-op for setting the Bug 504087 - make gtk_tooltip_set_custom a no-op for setting the

4
gdk/gdk.h
View File

@ -27,6 +27,8 @@
#ifndef __GDK_H__ #ifndef __GDK_H__
#define __GDK_H__ #define __GDK_H__
#define __GDK_H_INSIDE__
#include <gdk/gdkapplaunchcontext.h> #include <gdk/gdkapplaunchcontext.h>
#include <gdk/gdkcairo.h> #include <gdk/gdkcairo.h>
#include <gdk/gdkcolor.h> #include <gdk/gdkcolor.h>
@ -56,6 +58,8 @@
#include <gdk/gdkvisual.h> #include <gdk/gdkvisual.h>
#include <gdk/gdkwindow.h> #include <gdk/gdkwindow.h>
#undef __GDK_H_INSIDE__
G_BEGIN_DECLS G_BEGIN_DECLS

4
gdk/gdkapplaunchcontext.h
View File

@ -20,6 +20,10 @@
Author: Alexander Larsson <alexl@redhat.com> 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__ #ifndef __GDK_APP_LAUNCH_CONTEXT_H__
#define __GDK_APP_LAUNCH_CONTEXT_H__ #define __GDK_APP_LAUNCH_CONTEXT_H__

4
gdk/gdkcairo.h
View File

@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA. * 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__ #ifndef __GDK_CAIRO_H__
#define __GDK_CAIRO_H__ #define __GDK_CAIRO_H__

4
gdk/gdkcolor.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_COLOR_H__
#define __GDK_COLOR_H__ #define __GDK_COLOR_H__

4
gdk/gdkcursor.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_CURSOR_H__
#define __GDK_CURSOR_H__ #define __GDK_CURSOR_H__

5
gdk/gdkdisplay.h
View File

@ -21,12 +21,15 @@
* Boston, MA 02111-1307, USA. * 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__ #ifndef __GDK_DISPLAY_H__
#define __GDK_DISPLAY_H__ #define __GDK_DISPLAY_H__
#include <gdk/gdktypes.h> #include <gdk/gdktypes.h>
#include <gdk/gdkevents.h> #include <gdk/gdkevents.h>
#include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS

4
gdk/gdkdisplaymanager.h
View File

@ -24,6 +24,10 @@
* 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_DISPLAY_MANAGER_H__ #ifndef __GDK_DISPLAY_MANAGER_H__
#define __GDK_DISPLAY_MANAGER_H__ #define __GDK_DISPLAY_MANAGER_H__

5
gdk/gdkdnd.h
View File

@ -23,6 +23,11 @@
* files for a list of changes. These files are distributed with * 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__ #ifndef __GDK_DND_H__
#define __GDK_DND_H__ #define __GDK_DND_H__

5
gdk/gdkdrawable.h
View File

@ -23,6 +23,11 @@
* files for a list of changes. These files are distributed with * 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__ #ifndef __GDK_DRAWABLE_H__
#define __GDK_DRAWABLE_H__ #define __GDK_DRAWABLE_H__

4
gdk/gdkenumtypes.h.template
View File

@ -1,4 +1,8 @@
/*** BEGIN file-header ***/ /*** 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__ #ifndef __GDK_ENUM_TYPES_H__
#define __GDK_ENUM_TYPES_H__ #define __GDK_ENUM_TYPES_H__

4
gdk/gdkevents.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_EVENTS_H__
#define __GDK_EVENTS_H__ #define __GDK_EVENTS_H__

4
gdk/gdkgc.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_GC_H__
#define __GDK_GC_H__ #define __GDK_GC_H__

4
gdk/gdkimage.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_IMAGE_H__
#define __GDK_IMAGE_H__ #define __GDK_IMAGE_H__

4
gdk/gdkinput.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_INPUT_H__
#define __GDK_INPUT_H__ #define __GDK_INPUT_H__

4
gdk/gdkkeys.h
View File

@ -24,6 +24,10 @@
* 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_KEYS_H__ #ifndef __GDK_KEYS_H__
#define __GDK_KEYS_H__ #define __GDK_KEYS_H__

4
gdk/gdkpango.h
View File

@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA. * 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__ #ifndef __GDK_PANGO_H__
#define __GDK_PANGO_H__ #define __GDK_PANGO_H__

4
gdk/gdkpixbuf.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_PIXBUF_H__
#define __GDK_PIXBUF_H__ #define __GDK_PIXBUF_H__

4
gdk/gdkpixmap.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_PIXMAP_H__
#define __GDK_PIXMAP_H__ #define __GDK_PIXMAP_H__

9
gdk/gdkprivate.h
View File

@ -27,14 +27,7 @@
#ifndef __GDK_PRIVATE_H__ #ifndef __GDK_PRIVATE_H__
#define __GDK_PRIVATE_H__ #define __GDK_PRIVATE_H__
#include <gdk/gdktypes.h> #include <gdk/gdk.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>
G_BEGIN_DECLS G_BEGIN_DECLS

4
gdk/gdkproperty.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_PROPERTY_H__
#define __GDK_PROPERTY_H__ #define __GDK_PROPERTY_H__

4
gdk/gdkregion.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_REGION_H__
#define __GDK_REGION_H__ #define __GDK_REGION_H__

4
gdk/gdkrgb.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_RGB_H__
#define __GDK_RGB_H__ #define __GDK_RGB_H__

4
gdk/gdkscreen.h
View File

@ -21,6 +21,10 @@
* Boston, MA 02111-1307, USA. * 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__ #ifndef __GDK_SCREEN_H__
#define __GDK_SCREEN_H__ #define __GDK_SCREEN_H__

4
gdk/gdkselection.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_SELECTION_H__
#define __GDK_SELECTION_H__ #define __GDK_SELECTION_H__

4
gdk/gdkspawn.h
View File

@ -19,6 +19,10 @@
* Authors: Mark McLoughlin <mark@skynet.ie> * 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__ #ifndef __GDK_SPAWN_H__
#define __GDK_SPAWN_H__ #define __GDK_SPAWN_H__

6
gdk/gdktestutils.h
View File

@ -17,6 +17,11 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * 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__ #ifndef __GDK_TEST_UTILS_H__
#define __GDK_TEST_UTILS_H__ #define __GDK_TEST_UTILS_H__
@ -38,6 +43,7 @@ gboolean gdk_test_simulate_button (GdkWindow *window,
guint button, /*1..3*/ guint button, /*1..3*/
GdkModifierType modifiers, GdkModifierType modifiers,
GdkEventType button_pressrelease); GdkEventType button_pressrelease);
G_END_DECLS G_END_DECLS
#endif /* __GDK_TEST_UTILS_H__ */ #endif /* __GDK_TEST_UTILS_H__ */

4
gdk/gdktypes.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_TYPES_H__
#define __GDK_TYPES_H__ #define __GDK_TYPES_H__

4
gdk/gdkvisual.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_VISUAL_H__
#define __GDK_VISUAL_H__ #define __GDK_VISUAL_H__

4
gdk/gdkwindow.h
View File

@ -24,6 +24,10 @@
* 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__ #ifndef __GDK_WINDOW_H__
#define __GDK_WINDOW_H__ #define __GDK_WINDOW_H__

1
gdk/win32/gdkwin32.h
View File

@ -28,7 +28,6 @@
#define __GDK_WIN32_H__ #define __GDK_WIN32_H__
#include <gdk/gdkprivate.h> #include <gdk/gdkprivate.h>
#include <gdk/gdkcursor.h>
#ifndef STRICT #ifndef STRICT
#define STRICT /* We want strict type checks */ #define STRICT /* We want strict type checks */

1
gdk/x11/gdkx.h
View File

@ -28,7 +28,6 @@
#define __GDK_X_H__ #define __GDK_X_H__
#include <gdk/gdkprivate.h> #include <gdk/gdkprivate.h>
#include <gdk/gdkcursor.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>