Trivial cleanups. (#169647, #303455, Fabricio Barros Cabral, Benoit

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

	* gtk/*.h: Trivial cleanups. (#169647, #303455,
	Fabricio Barros Cabral, Benoit Carpentier)

38 files changed, 124 insertions, 225 deletions

diff --git a/ChangeLog b/ChangeLog
index aa20dda334..85c8a551e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2005-06-21  Matthias Clasen  <mclasen@redhat.com>
 
-	* gtk/gtklabel.h: Consistently use gchar.  (#303455, 
-	Benoit Carpentier)
+	* gtk/*.h: Trivial cleanups. (#169647, #303455, 
+	Fabricio Barros Cabral, Benoit Carpentier)
 
 	* gdk/gdk.symbols: 
 	* gdk/gdkwindow.h: 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index aa20dda334..85c8a551e5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,7 +1,7 @@
 2005-06-21  Matthias Clasen  <mclasen@redhat.com>
 
-	* gtk/gtklabel.h: Consistently use gchar.  (#303455, 
-	Benoit Carpentier)
+	* gtk/*.h: Trivial cleanups. (#169647, #303455, 
+	Fabricio Barros Cabral, Benoit Carpentier)
 
 	* gdk/gdk.symbols: 
 	* gdk/gdkwindow.h: 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index aa20dda334..85c8a551e5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,7 +1,7 @@
 2005-06-21  Matthias Clasen  <mclasen@redhat.com>
 
-	* gtk/gtklabel.h: Consistently use gchar.  (#303455, 
-	Benoit Carpentier)
+	* gtk/*.h: Trivial cleanups. (#169647, #303455, 
+	Fabricio Barros Cabral, Benoit Carpentier)
 
 	* gdk/gdk.symbols: 
 	* gdk/gdkwindow.h: 
diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index d79fee5887..1fe3e4ae8b 100644
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -31,11 +31,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtkobject.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_ADJUSTMENT                  (gtk_adjustment_get_type ())
 #define GTK_ADJUSTMENT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ADJUSTMENT, GtkAdjustment))
@@ -91,9 +87,6 @@ gdouble	   gtk_adjustment_get_value		(GtkAdjustment   *adjustment);
 void	   gtk_adjustment_set_value		(GtkAdjustment	 *adjustment,
 						 gdouble	  value);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_ADJUSTMENT_H__ */
diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index 6600c330d6..df39c54184 100644
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@@ -32,10 +32,7 @@
 #include <gtk/gtkbin.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_ALIGNMENT                  (gtk_alignment_get_type ())
 #define GTK_ALIGNMENT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ALIGNMENT, GtkAlignment))
@@ -88,9 +85,7 @@ void       gtk_alignment_get_padding (GtkAlignment      *alignment,
 				      guint             *padding_left,
 				      guint             *padding_right);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_ALIGNMENT_H__ */
diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h
index 422b4e6ec4..7692b77180 100644
--- a/gtk/gtkarrow.h
+++ b/gtk/gtkarrow.h
@@ -32,9 +32,7 @@
 #include <gtk/gtkmisc.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_ARROW                  (gtk_arrow_get_type ())
@@ -70,9 +68,7 @@ void       gtk_arrow_set        (GtkArrow      *arrow,
 				 GtkShadowType  shadow_type);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_ARROW_H__ */
diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index 2427f3d210..8c479f9ce0 100644
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -36,9 +36,7 @@
 #include <gtk/gtkenums.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 /* Binding sets
@@ -153,9 +151,8 @@ guint _gtk_binding_signal_new (const gchar       *signal_name,
 			       GType		  return_type,
 			       guint		  n_params,
 			       ...);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
 
 
 #endif /* __GTK_BINDINGS_H__ */
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 11a6e46844..b4fec74938 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -32,9 +32,7 @@
 #include <gtk/gtkcontainer.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_BOX            (gtk_box_get_type ())
@@ -113,10 +111,7 @@ void	   gtk_box_set_child_packing   (GtkBox	     *box,
 					GtkPackType   pack_type);
 
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_BOX_H__ */
diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h
index 85c6bb3459..b479c9c752 100644
--- a/gtk/gtkcellrendererpixbuf.h
+++ b/gtk/gtkcellrendererpixbuf.h
@@ -22,9 +22,8 @@
 
 #include <gtk/gtkcellrenderer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_CELL_RENDERER_PIXBUF			(gtk_cell_renderer_pixbuf_get_type ())
@@ -61,8 +60,8 @@ struct _GtkCellRendererPixbufClass
 GType            gtk_cell_renderer_pixbuf_get_type (void) G_GNUC_CONST;
 GtkCellRenderer *gtk_cell_renderer_pixbuf_new      (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
+
 
 #endif /* __GTK_CELL_RENDERER_PIXBUF_H__ */
diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h
index 599bb8b27b..fef52adf22 100644
--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@@ -23,9 +23,8 @@
 #include <pango/pango.h>
 #include <gtk/gtkcellrenderer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_CELL_RENDERER_TEXT		(gtk_cell_renderer_text_get_type ())
@@ -97,9 +96,7 @@ void             gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRende
 								    gint                 number_of_rows);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_CELL_RENDERER_TEXT_H__ */
diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h
index fe8983e1f5..302909bd60 100644
--- a/gtk/gtkcellrenderertoggle.h
+++ b/gtk/gtkcellrenderertoggle.h
@@ -22,9 +22,8 @@
 
 #include <gtk/gtkcellrenderer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_CELL_RENDERER_TOGGLE			(gtk_cell_renderer_toggle_get_type ())
@@ -72,9 +71,8 @@ gboolean        gtk_cell_renderer_toggle_get_active (GtkCellRendererToggle *togg
 void            gtk_cell_renderer_toggle_set_active (GtkCellRendererToggle *toggle,
                                                      gboolean               setting);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
 
 
 #endif /* __GTK_CELL_RENDERER_TOGGLE_H__ */
diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index 384ee3e7d4..6d5ca31a7e 100644
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -39,9 +39,9 @@
 #include <gtk/gtkvscrollbar.h>
 #include <gtk/gtkenums.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
 
 /* clist flags */
 enum {
@@ -785,9 +785,9 @@ PangoLayout *_gtk_clist_create_cell_layout (GtkCList       *clist,
 					    GtkCListRow    *clist_row,
 					    gint            column);
 
-#ifdef __cplusplus
-}
-#endif				/* __cplusplus */
+
+G_END_DECLS
+
 
 #endif				/* __GTK_CLIST_H__ */
 
diff --git a/gtk/gtkfilesel.h b/gtk/gtkfilesel.h
index 7595095d66..e22eb77765 100644
--- a/gtk/gtkfilesel.h
+++ b/gtk/gtkfilesel.h
@@ -32,9 +32,7 @@
 #include <gtk/gtkdialog.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_FILE_SELECTION            (gtk_file_selection_get_type ())
@@ -118,9 +116,8 @@ void       gtk_file_selection_set_select_multiple (GtkFileSelection *filesel,
 						   gboolean          select_multiple);
 gboolean   gtk_file_selection_get_select_multiple (GtkFileSelection *filesel);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
 
 
 #endif /* __GTK_FILESEL_H__ */
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 7fa5850653..85729d13c0 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -32,9 +32,7 @@
 #include <gtk/gtkbin.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_FRAME                  (gtk_frame_get_type ())
@@ -88,9 +86,8 @@ void       gtk_frame_set_shadow_type  (GtkFrame      *frame,
 				       GtkShadowType  type);
 GtkShadowType gtk_frame_get_shadow_type (GtkFrame    *frame);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
 
 
 #endif /* __GTK_FRAME_H__ */
diff --git a/gtk/gtkhscrollbar.h b/gtk/gtkhscrollbar.h
index eecca102cc..a6f595ba98 100644
--- a/gtk/gtkhscrollbar.h
+++ b/gtk/gtkhscrollbar.h
@@ -32,9 +32,7 @@
 #include <gtk/gtkscrollbar.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_HSCROLLBAR            (gtk_hscrollbar_get_type ())
@@ -63,9 +61,7 @@ GType      gtk_hscrollbar_get_type (void) G_GNUC_CONST;
 GtkWidget* gtk_hscrollbar_new      (GtkAdjustment *adjustment);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_HSCROLLBAR_H__ */
diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h
index 58f1b95077..a1417cc063 100644
--- a/gtk/gtkimcontextsimple.h
+++ b/gtk/gtkimcontextsimple.h
@@ -22,9 +22,8 @@
 
 #include <gtk/gtkimcontext.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_IM_CONTEXT_SIMPLE              (gtk_im_context_simple_get_type ())
@@ -65,9 +64,9 @@ void          gtk_im_context_simple_add_table (GtkIMContextSimple *context_simpl
 					       guint16            *data,
 					       gint                max_seq_len,
 					       gint                n_seqs);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+
+G_END_DECLS
 
 
 #endif /* __GTK_IM_CONTEXT_SIMPLE_H__ */
diff --git a/gtk/gtkimmodule.h b/gtk/gtkimmodule.h
index a3ecf1b08f..2b6267646e 100644
--- a/gtk/gtkimmodule.h
+++ b/gtk/gtkimmodule.h
@@ -20,9 +20,9 @@
 #ifndef __GTK_IM_MODULE_H__
 #define __GTK_IM_MODULE_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
 
 #include <gtk/gtkimcontext.h>
 
@@ -55,8 +55,8 @@ void          im_module_exit   (void);
 GtkIMContext *im_module_create (const gchar             *context_id);
 */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
+
 
 #endif /* __GTK_IM_MODULE_H__ */
diff --git a/gtk/gtklistitem.h b/gtk/gtklistitem.h
index f9d6ad13f5..9738bce416 100644
--- a/gtk/gtklistitem.h
+++ b/gtk/gtklistitem.h
@@ -34,9 +34,7 @@
 #include <gtk/gtkitem.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_LIST_ITEM              (gtk_list_item_get_type ())
@@ -87,10 +85,7 @@ void       gtk_list_item_deselect       (GtkListItem      *list_item);
 
 
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_LIST_ITEM_H__ */
diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 20b5acb1b7..b985bc6771 100644
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -23,9 +23,9 @@
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
 
 #define GTK_TYPE_LIST_STORE	       (gtk_list_store_get_type ())
 #define GTK_LIST_STORE(obj)	       (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LIST_STORE, GtkListStore))
@@ -131,9 +131,7 @@ void          gtk_list_store_move_before      (GtkListStore *store,
                                                GtkTreeIter  *position);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_LIST_STORE_H__ */
diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index f315c32a2a..53fba835fb 100644
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.h
@@ -32,9 +32,7 @@
 #include <gtk/gtkmenushell.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define	GTK_TYPE_MENU_BAR               (gtk_menu_bar_get_type ())
@@ -84,9 +82,8 @@ void             gtk_menu_bar_set_child_pack_direction (GtkMenuBar       *menuba
 void _gtk_menu_bar_cycle_focus (GtkMenuBar       *menubar,
 				GtkDirectionType  dir);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
 
 
 #endif /* __GTK_MENU_BAR_H__ */
diff --git a/gtk/gtkmodules.h b/gtk/gtkmodules.h
index c7ebd395a7..bd157f79a7 100644
--- a/gtk/gtkmodules.h
+++ b/gtk/gtkmodules.h
@@ -23,9 +23,9 @@
 
 #include <gtk/gtksettings.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
 
 /* Functions for use within GTK+
  */
@@ -43,8 +43,8 @@ typedef void	 (*GtkModuleInitFunc)        (gint	  *argc,
 					      gchar      ***argv);
 typedef void	 (*GtkModuleDisplayInitFunc) (GdkDisplay   *display);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
+
 
 #endif /* __GTK_MODULES_H__ */
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index 12bcd8048a..7bd057e51b 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -33,9 +33,7 @@
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_RANGE            (gtk_range_get_type ())
@@ -155,9 +153,8 @@ gdouble        gtk_range_get_value         (GtkRange      *range);
 gdouble	      _gtk_range_get_wheel_delta   (GtkRange           *range,
 					    GdkScrollDirection  direction);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
 
 
 #endif /* __GTK_RANGE_H__ */
diff --git a/gtk/gtkrbtree.h b/gtk/gtkrbtree.h
index bf149836dd..c6e3c20d8a 100644
--- a/gtk/gtkrbtree.h
+++ b/gtk/gtkrbtree.h
@@ -22,9 +22,9 @@
 #ifndef __GTK_RBTREE_H__
 #define __GTK_RBTREE_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
 
 #include <glib.h>
 typedef enum
@@ -177,8 +177,8 @@ void       _gtk_rbtree_test             (const gchar            *where,
 void       _gtk_rbtree_debug_spew       (GtkRBTree              *tree);
 #endif
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
+
 
 #endif /* __GTK_RBTREE_H__ */
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index 4d40013163..de6b643191 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -34,9 +34,7 @@
 #include <gtk/gtkviewport.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_SCROLLED_WINDOW            (gtk_scrolled_window_get_type ())
@@ -126,9 +124,8 @@ void	       gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_w
 
 gint _gtk_scrolled_window_get_scrollbar_spacing (GtkScrolledWindow *scrolled_window);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
 
 
 #endif /* __GTK_SCROLLED_WINDOW_H__ */
diff --git a/gtk/gtktextutil.h b/gtk/gtktextutil.h
index d12c8abd1e..2a9b6d3b2f 100644
--- a/gtk/gtktextutil.h
+++ b/gtk/gtktextutil.h
@@ -32,9 +32,7 @@
 #include <gtk/gtkmenushell.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 /* This is a private uninstalled header shared between GtkTextView and GtkEntry */
@@ -46,9 +44,7 @@ void _gtk_text_util_append_special_char_menuitems (GtkMenuShell              *me
                                                    gpointer                   data);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_TEXT_UTIL_H__ */
diff --git a/gtk/gtktreeprivate.h b/gtk/gtktreeprivate.h
index 219070a001..f91679b261 100644
--- a/gtk/gtktreeprivate.h
+++ b/gtk/gtktreeprivate.h
@@ -21,9 +21,8 @@
 #define __GTK_TREE_PRIVATE_H__
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
+
 
 #include <gtk/gtktreeview.h>
 #include <gtk/gtktreeselection.h>
@@ -391,9 +390,7 @@ void              _gtk_tree_view_column_get_neighbor_sizes (GtkTreeViewColumn *c
 							    gint              *right);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_TREE_PRIVATE_H__ */
diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 462a0e7311..2c3e0a2b82 100644
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -23,9 +23,9 @@
 #include <glib-object.h>
 #include <gtk/gtktreeview.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
 
 #define GTK_TYPE_TREE_SELECTION			(gtk_tree_selection_get_type ())
 #define GTK_TREE_SELECTION(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_SELECTION, GtkTreeSelection))
@@ -116,9 +116,7 @@ void             gtk_tree_selection_unselect_range      (GtkTreeSelection
 							 GtkTreePath                 *end_path);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_TREE_SELECTION_H__ */
diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index aef4a89035..58e018b74b 100644
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -24,9 +24,9 @@
 #include <gtk/gtktreesortable.h>
 #include <stdarg.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
 
 #define GTK_TYPE_TREE_STORE			(gtk_tree_store_get_type ())
 #define GTK_TREE_STORE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_STORE, GtkTreeStore))
@@ -131,9 +131,7 @@ void          gtk_tree_store_move_after       (GtkTreeStore *tree_store,
                                                GtkTreeIter  *position);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_TREE_STORE_H__ */
diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 8e8850e7f3..85e0d861b6 100644
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -25,9 +25,9 @@
 #include <gtk/gtktreeviewcolumn.h>
 #include <gtk/gtkdnd.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
 
 typedef enum
 {
@@ -332,9 +332,8 @@ void                        gtk_tree_view_set_row_separator_func (GtkTreeView
 								  gpointer                    data,
 								  GtkDestroyNotify            destroy);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+G_END_DECLS
 
 
 #endif /* __GTK_TREE_VIEW_H__ */
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 765cea54da..83197150ce 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -28,9 +28,9 @@
 /* Not needed, retained for compatibility -Yosh */
 #include <gtk/gtkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
 
 #define GTK_TYPE_TREE_VIEW_COLUMN	     (gtk_tree_view_column_get_type ())
 #define GTK_TREE_VIEW_COLUMN(obj)	     (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumn))
@@ -232,9 +232,8 @@ gboolean                gtk_tree_view_column_cell_get_position   (GtkTreeViewCol
 					                          gint                    *width);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
 
 #endif /* __GTK_TREE_VIEW_COLUMN_H__ */
 
diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h
index 45980d0853..7889440485 100644
--- a/gtk/gtkvbbox.h
+++ b/gtk/gtkvbbox.h
@@ -31,9 +31,7 @@
 #include <gtk/gtkbbox.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_VBUTTON_BOX            (gtk_vbutton_box_get_type ())
@@ -72,9 +70,7 @@ void gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout);
 #endif
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_VBUTTON_BOX_H__ */
diff --git a/gtk/gtkvbox.h b/gtk/gtkvbox.h
index 71b522f908..3cdb2ad15f 100644
--- a/gtk/gtkvbox.h
+++ b/gtk/gtkvbox.h
@@ -32,9 +32,7 @@
 #include <gtk/gtkbox.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_VBOX		 (gtk_vbox_get_type ())
@@ -64,9 +62,7 @@ GtkWidget* gtk_vbox_new	     (gboolean homogeneous,
 			      gint spacing);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_VBOX_H__ */
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index 0c07940d8a..8b64f1743c 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -33,9 +33,7 @@
 #include <gtk/gtkbin.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_VIEWPORT            (gtk_viewport_get_type ())
@@ -84,9 +82,7 @@ void           gtk_viewport_set_shadow_type (GtkViewport   *viewport,
 GtkShadowType  gtk_viewport_get_shadow_type (GtkViewport   *viewport);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_VIEWPORT_H__ */
diff --git a/gtk/gtkvpaned.h b/gtk/gtkvpaned.h
index c3b3c729e4..10bb9a0c3f 100644
--- a/gtk/gtkvpaned.h
+++ b/gtk/gtkvpaned.h
@@ -29,9 +29,8 @@
 
 #include <gtk/gtkpaned.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_VPANED            (gtk_vpaned_get_type ())
@@ -59,8 +58,7 @@ GType      gtk_vpaned_get_type (void) G_GNUC_CONST;
 GtkWidget *gtk_vpaned_new      (void);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
 
 #endif /* __GTK_VPANED_H__ */
diff --git a/gtk/gtkvruler.h b/gtk/gtkvruler.h
index ef626e690e..2b27e52fe4 100644
--- a/gtk/gtkvruler.h
+++ b/gtk/gtkvruler.h
@@ -42,9 +42,7 @@
 #include <gtk/gtkruler.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_VRULER            (gtk_vruler_get_type ())
@@ -73,9 +71,7 @@ GType      gtk_vruler_get_type (void) G_GNUC_CONST;
 GtkWidget* gtk_vruler_new      (void);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_VRULER_H__ */
diff --git a/gtk/gtkvscale.h b/gtk/gtkvscale.h
index 7a1a66727a..8661b7515e 100644
--- a/gtk/gtkvscale.h
+++ b/gtk/gtkvscale.h
@@ -32,9 +32,7 @@
 #include <gtk/gtkscale.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_VSCALE            (gtk_vscale_get_type ())
@@ -66,10 +64,7 @@ GtkWidget* gtk_vscale_new_with_range (gdouble        min,
                                       gdouble        step);
 
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_VSCALE_H__ */
diff --git a/gtk/gtkvscrollbar.h b/gtk/gtkvscrollbar.h
index c4983bbbeb..bdd6c3d03f 100644
--- a/gtk/gtkvscrollbar.h
+++ b/gtk/gtkvscrollbar.h
@@ -32,6 +32,9 @@
 #include <gtk/gtkscrollbar.h>
 
 
+G_BEGIN_DECLS
+
+
 #define GTK_TYPE_VSCROLLBAR            (gtk_vscrollbar_get_type ())
 #define GTK_VSCROLLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_VSCROLLBAR, GtkVScrollbar))
 #define GTK_VSCROLLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSCROLLBAR, GtkVScrollbarClass))
@@ -54,18 +57,11 @@ struct _GtkVScrollbarClass
 };
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
 GType      gtk_vscrollbar_get_type (void) G_GNUC_CONST;
 GtkWidget* gtk_vscrollbar_new      (GtkAdjustment *adjustment);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GTK_VSCROLLBAR_H__ */
diff --git a/gtk/gtkvseparator.h b/gtk/gtkvseparator.h
index b55f2d9029..e7fd88b0e7 100644
--- a/gtk/gtkvseparator.h
+++ b/gtk/gtkvseparator.h
@@ -32,9 +32,7 @@
 #include <gtk/gtkseparator.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_TYPE_VSEPARATOR                  (gtk_vseparator_get_type ())
@@ -63,9 +61,7 @@ GType      gtk_vseparator_get_type (void) G_GNUC_CONST;
 GtkWidget* gtk_vseparator_new      (void);
 
 
+G_END_DECLS
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
 #endif /* __GTK_SEPARATOR_H__ */