--- np2/x11/gtk2/xnp2.h	2004/07/27 17:07:50	1.2
+++ np2/x11/gtk2/xnp2.h	2011/01/15 19:16:59	1.8
@@ -1,5 +1,3 @@
-/*	$Id: xnp2.h,v 1.2 2004/07/27 17:07:50 monaka Exp $	*/
-
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
  * All rights reserved.
@@ -12,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -30,12 +26,25 @@
 #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
+#ifndef	GTK_DISABLE_DEPRECATED
+#define	GTK_DISABLE_DEPRECATED
+#endif
+
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 extern GtkWidget *main_window;
 extern GtkWidget *drawarea;
@@ -49,12 +58,13 @@ typedef struct {
 void install_idle_process(void);
 void uninstall_idle_process(void);
 
-void gdk_window_set_pointer(GdkWindow *w, gint x, gint y);
 void gtk_scale_set_default_values(GtkScale *scale);
-int gdk_window_get_pixmap_format(GdkWindow *w, GdkVisual *visual, pixmap_format_t *fmtp);
+void gdk_window_set_pointer(GdkWindow *w, gint x, gint y);
+gboolean gdk_window_get_pixmap_format(GdkWindow *w, GdkVisual *visual, pixmap_format_t *fmtp);
+gboolean gtk_window_init_fullscreen(GtkWidget *widget);
+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__ */