gtk+ r20179 - in trunk: . examples/gtkdial modules/input

[mitch svn gnome org]

Author: mitch
Date: Mon May 26 14:34:24 2008
New Revision: 20179
URL: http://svn.gnome.org/viewvc/gtk+?rev=20179&view=rev

Log:
2008-05-26  Michael Natterer  <mitch imendio com>

	* examples/gtkdial/gtkdial.h
	* modules/input/gtkimcontextthai.h: use G_BEGIN/END_DECLS.



Modified:
   trunk/ChangeLog
   trunk/examples/gtkdial/gtkdial.h
   trunk/modules/input/gtkimcontextthai.h

Modified: trunk/examples/gtkdial/gtkdial.h
==============================================================================
--- trunk/examples/gtkdial/gtkdial.h	(original)
+++ trunk/examples/gtkdial/gtkdial.h	Mon May 26 14:34:24 2008
@@ -1,4 +1,3 @@
-
 /* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
@@ -17,6 +16,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
 #ifndef __GTK_DIAL_H__
 #define __GTK_DIAL_H__
 
@@ -26,9 +26,7 @@
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 
 #define GTK_DIAL(obj)          GTK_CHECK_CAST (obj, gtk_dial_get_type (), GtkDial)
@@ -83,9 +81,9 @@
 
 void           gtk_dial_set_adjustment         (GtkDial      *dial,
 						GtkAdjustment *adjustment);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+
+
+G_END_DECLS
 
 
 #endif /* __GTK_DIAL_H__ */

Modified: trunk/modules/input/gtkimcontextthai.h
==============================================================================
--- trunk/modules/input/gtkimcontextthai.h	(original)
+++ trunk/modules/input/gtkimcontextthai.h	Mon May 26 14:34:24 2008
@@ -24,9 +24,7 @@
 
 #include <gtk/gtkimcontext.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 extern GType gtk_type_im_context_thai;
 
@@ -74,9 +72,6 @@
   gtk_im_context_thai_set_isc_mode (GtkIMContextThai *context_thai,
                                     GtkIMContextThaiISCMode mode);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_IM_CONTEXT_THAI_H__ */