Cleanup. (#169648, Fabricio Barros Cabral)

2005-06-12  Matthias Clasen  <mclasen@redhat.com>

	* gdk/*.h: Cleanup.  (#169648, Fabricio Barros Cabral)

23 files changed, 45 insertions, 135 deletions

diff --git a/gdk/gdk.h b/gdk/gdk.h
index 4cbe1068e5..7bec453a98 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -54,9 +54,7 @@
 #include <gdk/gdkvisual.h>
 #include <gdk/gdkwindow.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 /* Initialization, exit and events
@@ -209,9 +207,7 @@ void     gdk_threads_set_lock_functions   (GCallback enter_fn,
 #  define GDK_THREADS_LEAVE()
 #endif	/* !G_THREADS_ENABLED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GDK_H__ */
diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index 4a9dd32498..406bd1f063 100644
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -3,9 +3,7 @@
 
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GdkDragContext        GdkDragContext;
 
@@ -138,8 +136,6 @@ void            gdk_drag_abort       (GdkDragContext *context,
 				      guint32         time_);
 gboolean        gdk_drag_drop_succeeded (GdkDragContext *context);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_DND_H__ */
diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index 1e9194e4d1..e6fc9914ad 100644
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -8,9 +8,7 @@
 
 #include <cairo.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GdkDrawableClass GdkDrawableClass;
 typedef struct _GdkTrapezoid     GdkTrapezoid;
@@ -391,8 +389,6 @@ GdkImage *gdk_drawable_copy_to_image (GdkDrawable  *drawable,
 GdkRegion *gdk_drawable_get_clip_region    (GdkDrawable *drawable);
 GdkRegion *gdk_drawable_get_visible_region (GdkDrawable *drawable);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_DRAWABLE_H__ */
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index 4095b362c7..32873091da 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -6,9 +6,7 @@
 #include <gdk/gdkdnd.h>
 #include <gdk/gdkinput.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GDK_TYPE_EVENT          (gdk_event_get_type ())
 
@@ -512,8 +510,6 @@ gboolean gdk_setting_get (const gchar *name,
 			  GValue      *value); 
 #endif /* GDK_MULTIHEAD_SAFE */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_EVENTS_H__ */
diff --git a/gdk/gdkfont.h b/gdk/gdkfont.h
index b4c1249b63..df051f5408 100644
--- a/gdk/gdkfont.h
+++ b/gdk/gdkfont.h
@@ -6,9 +6,7 @@
 #include <gdk/gdktypes.h>
 #include <pango/pango-font.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GDK_TYPE_FONT gdk_font_get_type ()
 
@@ -107,9 +105,7 @@ GdkDisplay * gdk_font_get_display (GdkFont *font);
 
 #endif /* GDK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_FONT_H__ */
 
diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h
index c17033e1b5..aa9d559b58 100644
--- a/gdk/gdkgc.h
+++ b/gdk/gdkgc.h
@@ -4,9 +4,7 @@
 #include <gdk/gdkcolor.h>
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GdkGCValues	      GdkGCValues;
 typedef struct _GdkGCClass	      GdkGCClass;
@@ -269,8 +267,6 @@ GdkScreen *  gdk_gc_get_screen	     (GdkGC          *gc);
 #define gdk_gc_destroy                 gdk_gc_unref
 #endif /* GDK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_DRAWABLE_H__ */
diff --git a/gdk/gdkinput.h b/gdk/gdkinput.h
index 3ff2582b03..8f8890dda4 100644
--- a/gdk/gdkinput.h
+++ b/gdk/gdkinput.h
@@ -3,9 +3,7 @@
 
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GDK_TYPE_DEVICE              (gdk_device_get_type ())
 #define GDK_DEVICE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DEVICE, GdkDevice))
@@ -142,8 +140,6 @@ void gdk_input_set_extension_events (GdkWindow        *window,
 GdkDevice *gdk_device_get_core_pointer (void);
 #endif
  
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_INPUT_H__ */
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index c5aaca8aaf..d535585673 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -383,8 +383,6 @@ void _gdk_windowing_gc_get_background (GdkGC    *gc,
 void _gdk_image_exit  (void);
 void _gdk_windowing_exit (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_INTERNALS_H__ */
diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index 356ca6d032..2c76bf5547 100644
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -29,9 +29,7 @@
 
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GdkKeymapKey GdkKeymapKey;
 
@@ -120,8 +118,6 @@ guint32  gdk_keyval_to_unicode   (guint        keyval) G_GNUC_CONST;
 guint    gdk_unicode_to_keyval   (guint32      wc) G_GNUC_CONST;
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_KEYS_H__ */
diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index 492f144ad1..496faf01fb 100644
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -22,9 +22,7 @@
 
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Pango interaction */
 
@@ -151,8 +149,6 @@ struct _GdkPangoAttrEmbossed
 PangoAttribute *gdk_pango_attr_stipple_new  (GdkBitmap *stipple);
 PangoAttribute *gdk_pango_attr_embossed_new (gboolean embossed);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_FONT_H__ */
diff --git a/gdk/gdkpixmap.h b/gdk/gdkpixmap.h
index 9da2c91c26..d1b4f10e2f 100644
--- a/gdk/gdkpixmap.h
+++ b/gdk/gdkpixmap.h
@@ -4,9 +4,7 @@
 #include <gdk/gdktypes.h>
 #include <gdk/gdkdrawable.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GdkPixmapObject GdkPixmapObject;
 typedef struct _GdkPixmapObjectClass GdkPixmapObjectClass;
@@ -92,8 +90,6 @@ GdkPixmap*    gdk_pixmap_lookup_for_display      (GdkDisplay      *display,
 #define gdk_pixmap_unref               gdk_drawable_unref
 #endif /* GDK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_PIXMAP_H__ */
diff --git a/gdk/gdkproperty.h b/gdk/gdkproperty.h
index 7d11514889..b5c9ebde1d 100644
--- a/gdk/gdkproperty.h
+++ b/gdk/gdkproperty.h
@@ -3,9 +3,7 @@
 
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum
 {
@@ -90,8 +88,6 @@ gboolean gdk_utf8_to_compound_text_for_display   (GdkDisplay   *display,
 void gdk_free_text_list             (gchar        **list);
 void gdk_free_compound_text         (guchar        *ctext);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_PROPERTY_H__ */
diff --git a/gdk/gdkregion.h b/gdk/gdkregion.h
index f4f4b47803..fa43be7d59 100644
--- a/gdk/gdkregion.h
+++ b/gdk/gdkregion.h
@@ -3,9 +3,7 @@
 
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* GC fill rule for polygons
  *  EvenOddRule
@@ -79,9 +77,7 @@ void gdk_region_spans_intersect_foreach (GdkRegion   *region,
 					 GdkSpanFunc  function,
 					 gpointer     data);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_REGION_H__ */
 
diff --git a/gdk/gdkrgb.h b/gdk/gdkrgb.h
index efd6a23806..f063383345 100644
--- a/gdk/gdkrgb.h
+++ b/gdk/gdkrgb.h
@@ -29,9 +29,7 @@
 
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GdkRgbCmap GdkRgbCmap;
 
@@ -140,9 +138,7 @@ gboolean     gdk_rgb_ditherable   (void);
 gboolean     gdk_rgb_colormap_ditherable (GdkColormap *cmap);
 #endif
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GDK_RGB_H__ */
diff --git a/gdk/gdkselection.h b/gdk/gdkselection.h
index 2013e28301..ef9352a3e7 100644
--- a/gdk/gdkselection.h
+++ b/gdk/gdkselection.h
@@ -3,9 +3,7 @@
 
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Predefined atoms relating to selections. In general, one will need to use
  * gdk_intern_atom
@@ -78,8 +76,6 @@ void       gdk_selection_send_notify_for_display (GdkDisplay *display,
 						  GdkAtom     property,
 						  guint32     time_);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_SELECTION_H__ */
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index d9fdcd6ec1..5472ca9d1a 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -56,9 +56,7 @@
 
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 /* Type definitions for the basic structures.
@@ -202,9 +200,7 @@ struct _GdkSpan
   gint width;
 };
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GDK_TYPES_H__ */
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index ce44309dc0..47e5620bc7 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -5,9 +5,7 @@
 #include <gdk/gdktypes.h>
 #include <gdk/gdkevents.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GdkGeometry           GdkGeometry;
 typedef struct _GdkWindowAttr	      GdkWindowAttr;
@@ -587,8 +585,6 @@ GdkWindow *gdk_get_default_root_window (void);
    gdk_draw_pixmap(drawable,gc,source_drawable,source_x,source_y,x,y,width,height)
 #endif /* GDK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_WINDOW_H__ */
diff --git a/gdk/win32/gdkdrawable-win32.h b/gdk/win32/gdkdrawable-win32.h
index 67f12f573e..d11ee6ad93 100644
--- a/gdk/win32/gdkdrawable-win32.h
+++ b/gdk/win32/gdkdrawable-win32.h
@@ -30,9 +30,7 @@
 #include <gdk/gdkdrawable.h>
 #include <gdk/win32/gdkwin32.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Drawable implementation for Win32
  */
@@ -72,8 +70,6 @@ HDC  _gdk_win32_drawable_acquire_dc (GdkDrawable *drawable);
 void _gdk_win32_drawable_release_dc (GdkDrawable *drawable);
 void _gdk_win32_drawable_finish     (GdkDrawable *drawable);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_DRAWABLE_WIN32_H__ */
diff --git a/gdk/win32/gdkpixmap-win32.h b/gdk/win32/gdkpixmap-win32.h
index 3e7e4f76c9..fbeb28f7d1 100644
--- a/gdk/win32/gdkpixmap-win32.h
+++ b/gdk/win32/gdkpixmap-win32.h
@@ -30,9 +30,7 @@
 #include <gdk/win32/gdkdrawable-win32.h>
 #include <gdk/gdkpixmap.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Pixmap implementation for Win32
  */
@@ -64,8 +62,6 @@ struct _GdkPixmapImplWin32Class
 
 GType _gdk_pixmap_impl_win32_get_type (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_PIXMAP_WIN32_H__ */
diff --git a/gdk/win32/gdkwindow-win32.h b/gdk/win32/gdkwindow-win32.h
index ba6bb01ec9..62debe513d 100644
--- a/gdk/win32/gdkwindow-win32.h
+++ b/gdk/win32/gdkwindow-win32.h
@@ -29,9 +29,7 @@
 
 #include <gdk/win32/gdkdrawable-win32.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GdkWin32PositionInfo    GdkWin32PositionInfo;
 
@@ -96,8 +94,6 @@ struct _GdkWindowImplWin32Class
 
 GType _gdk_window_impl_win32_get_type (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_WINDOW_WIN32_H__ */
diff --git a/gdk/x11/MwmUtil.h b/gdk/x11/MwmUtil.h
index 53925f685a..7d4c5bc645 100644
--- a/gdk/x11/MwmUtil.h
+++ b/gdk/x11/MwmUtil.h
@@ -36,9 +36,7 @@
 
 #include <X11/Xmd.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 typedef struct {
     unsigned long flags;
@@ -133,8 +131,6 @@ typedef PropMotifWmInfo PropMwmInfo;
 #define PROP_MOTIF_WM_INFO_ELEMENTS 2
 #define PROP_MWM_INFO_ELEMENTS PROP_MOTIF_WM_INFO_ELEMENTS
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* MWMUTIL_H_INCLUDED */
diff --git a/gdk/x11/gdkdrawable-x11.h b/gdk/x11/gdkdrawable-x11.h
index e4b8a61fcf..18f5baf085 100644
--- a/gdk/x11/gdkdrawable-x11.h
+++ b/gdk/x11/gdkdrawable-x11.h
@@ -34,9 +34,7 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrender.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Drawable implementation for X11
  */
@@ -95,8 +93,6 @@ void  _gdk_x11_convert_to_format      (guchar           *src_buf,
 void _gdk_x11_drawable_finish           (GdkDrawable  *drawable);
 void _gdk_x11_drawable_update_size      (GdkDrawable  *drawable);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_DRAWABLE_X11_H__ */
diff --git a/gdk/x11/gdkpixmap-x11.h b/gdk/x11/gdkpixmap-x11.h
index b375c696cf..9da6911093 100644
--- a/gdk/x11/gdkpixmap-x11.h
+++ b/gdk/x11/gdkpixmap-x11.h
@@ -30,9 +30,7 @@
 #include <gdk/x11/gdkdrawable-x11.h>
 #include <gdk/gdkpixmap.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Pixmap implementation for X11
  */
@@ -65,8 +63,6 @@ struct _GdkPixmapImplX11Class
 
 GType gdk_pixmap_impl_x11_get_type (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GDK_PIXMAP_X11_H__ */