--- np2/x11/gtk2/xnp2.h	2007/01/12 19:09:58	1.4
+++ np2/x11/gtk2/xnp2.h	2011/01/15 19:16:59	1.8
@@ -1,5 +1,3 @@
-/*	$Id: xnp2.h,v 1.4 2007/01/12 19:09:58 monaka Exp $	*/
-
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
  * All rights reserved.
@@ -28,6 +26,14 @@
 #ifndef	NP2_GTK2_XNP2_H__
 #define	NP2_GTK2_XNP2_H__
 
+#ifndef	G_DISABLE_DEPRECATED
+#define	G_DISABLE_DEPRECATED
+#endif
+
+#ifndef	GLIB_DISABLE_DEPRECATED
+#define	GLIB_DISABLE_DEPRECATED
+#endif
+
 #ifndef	GDK_DISABLE_DEPRECATED
 #define	GDK_DISABLE_DEPRECATED
 #endif
@@ -38,9 +44,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 extern GtkWidget *main_window;
 extern GtkWidget *drawarea;
@@ -61,8 +65,6 @@ gboolean gtk_window_init_fullscreen(GtkW
 void gtk_window_fullscreen_mode(GtkWidget *widget);
 void gtk_window_restore_mode(GtkWidget *widget);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* NP2_GTK2_XNP2_H__ */