--- np2/x11/gtk/Attic/gtk_drawmng.h	2003/12/11 15:11:56	1.1
+++ np2/x11/gtk/Attic/gtk_drawmng.h	2005/03/12 12:36:40	1.5
@@ -1,3 +1,5 @@
+/*	$Id: gtk_drawmng.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
@@ -30,36 +30,18 @@
 
 #include "compiler.h"
 
-#include "cmndraw.h"
 #include "drawmng.h"
 
 #include "gtk/xnp2.h"
 
 typedef struct {
-	CMNVRAM		vram;
-
-	int		width;
-	int		height;
-	int		lpitch;
-
-	RECT_T		src;
-	POINT_T		dest;
-
-	PAL16MASK	pal16mask;
+	_DRAWMNG_HDL	d;
 
 	GtkWidget	*drawarea;
 	GdkImage	*surface;
 	GdkPixmap	*backsurf;
-	BOOL		shared_pixmap;
 } _GTKDRAWMNG_HDL, *GTKDRAWMNG_HDL;
 
-GTKDRAWMNG_HDL gtkdrawmng_create(GtkWidget *parent, int width, int height);
-void gtkdrawmng_release(GTKDRAWMNG_HDL hdl);
-CMNVRAM *gtkdrawmng_surflock(GTKDRAWMNG_HDL hdl);
-void gtkdrawmng_surfunlock(GTKDRAWMNG_HDL hdl);
-void gtkdrawmng_blt(GTKDRAWMNG_HDL hdl, RECT_T *sr, POINT_T *dp);
-void gtkdrawmng_set_size(GTKDRAWMNG_HDL hdl, int width, int height);
-
-int gtkdrawmng_getbpp(GtkWidget *w, GtkWidget *parent_window);
+BOOL gtkdrawmng_getformat(GtkWidget *w, GtkWidget *pw, pixmap_format_t *fmtp);
 
 #endif	/* NP2_X11_GTK_GTKDRAWMNG_H__ */