--- np2/x11/gtk/Attic/xnp2.h	2003/11/26 14:55:01	1.2
+++ np2/x11/gtk/Attic/xnp2.h	2005/03/12 12:36:40	1.5
@@ -1,3 +1,5 @@
+/*	$Id: xnp2.h,v 1.5 2005/03/12 12:36:40 monaka Exp $	*/
+
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
  * All rights reserved.
@@ -10,8 +12,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
@@ -31,15 +31,29 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-extern GtkWidget *window;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern GtkWidget *main_window;
 extern GtkWidget *drawarea;
 
+typedef struct {
+	int depth;
+	int bits_per_pixel;
+	int scanline_pad;
+} pixmap_format_t;
+
 void install_idle_process(void);
 void uninstall_idle_process(void);
 
-void gdk_window_set_pointer(GdkWindow *window, gint x, gint y);
+void gdk_window_set_pointer(GdkWindow *w, gint x, gint y);
 void gtk_scale_set_default_values(GtkScale *scale);
-int is_32bpp(GdkWindow *window);
-GdkPixmap *gdk_pixmap_shpix_new(GdkWindow *window, GdkImage *image, gint width, gint height, gint depth);
+int gdk_window_get_pixmap_format(GdkWindow *w, GdkVisual *visual, pixmap_format_t *fmtp);
+GdkPixmap *gdk_pixmap_shpix_new(GdkWindow *w, GdkImage *image, gint width, gint height, gint depth);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* NP2_GTK_XNP2_H__ */