From: Michael Natterer Date: Mon, 26 May 2008 14:34:24 +0000 (+0000) Subject: examples/gtkdial/gtkdial.h use G_BEGIN/END_DECLS. X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=a21f711c671d54f68e42c0dda2334c9a5f205104;hp=5327e28edd1facde06ee1eb1746e581a38e7ba34;p=~andy%2Fgtk examples/gtkdial/gtkdial.h use G_BEGIN/END_DECLS. 2008-05-26 Michael Natterer * examples/gtkdial/gtkdial.h * modules/input/gtkimcontextthai.h: use G_BEGIN/END_DECLS. svn path=/trunk/; revision=20179 --- diff --git a/ChangeLog b/ChangeLog index da418d922..f94d8c1d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-26 Michael Natterer + + * examples/gtkdial/gtkdial.h + * modules/input/gtkimcontextthai.h: use G_BEGIN/END_DECLS. + 2008-05-26 Michael Natterer * gtk/gtkimmodule.h: fix indentation. diff --git a/examples/gtkdial/gtkdial.h b/examples/gtkdial/gtkdial.h index 850d7ea1e..7f9096df9 100644 --- a/examples/gtkdial/gtkdial.h +++ b/examples/gtkdial/gtkdial.h @@ -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 -#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_update_policy (GtkDial *dial, void gtk_dial_set_adjustment (GtkDial *dial, GtkAdjustment *adjustment); -#ifdef __cplusplus -} -#endif /* __cplusplus */ + + +G_END_DECLS #endif /* __GTK_DIAL_H__ */ diff --git a/modules/input/gtkimcontextthai.h b/modules/input/gtkimcontextthai.h index 8c4049739..06b37f015 100644 --- a/modules/input/gtkimcontextthai.h +++ b/modules/input/gtkimcontextthai.h @@ -24,9 +24,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS extern GType gtk_type_im_context_thai; @@ -74,9 +72,6 @@ GtkIMContextThaiISCMode 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__ */