--- np2/x11/gtk/Attic/window_debug.c	2004/03/23 15:16:43	1.1
+++ np2/x11/gtk/Attic/window_debug.c	2004/07/27 17:07:49	1.3
@@ -1,4 +1,4 @@
-/*	$Id: window_debug.c,v 1.1 2004/03/23 15:16:43 monaka Exp $	*/
+/*	$Id: window_debug.c,v 1.3 2004/07/27 17:07:49 monaka Exp $	*/
 
 #include "compiler.h"
 
@@ -19,10 +19,9 @@
  */
 
 typedef struct {
-	GtkWidget	*window;
-	GTKDRAWMNG_HDL	hdl;
+	DRAWMNG_HDL	hdl;
 
-	BOOL		drawing;
+	GtkWidget	*window;
 } MEMDBG;
 
 static MEMDBG memdbg;
@@ -71,14 +70,12 @@ memdbg_draw(BOOL redraw)
 {
 	CMNVRAM *vram;
 
-	memdbg.drawing = TRUE;
-	vram = gtkdrawmng_surflock(memdbg.hdl);
+	vram = drawmng_surflock(memdbg.hdl);
 	if (vram) {
 		memdbg32_paint(vram, redraw);
-		gtkdrawmng_surfunlock(memdbg.hdl);
-		gtkdrawmng_blt(memdbg.hdl, NULL, NULL);
+		drawmng_surfunlock(memdbg.hdl);
+		drawmng_blt(memdbg.hdl, NULL, NULL);
 	}
-	memdbg.drawing = FALSE;
 }
 
 static void
@@ -87,7 +84,7 @@ setclientsize(void)
 	int width, height;
 
 	memdbg32_getsize(&width, &height);
-	gtkdrawmng_set_size(memdbg.hdl, width, height);
+	drawmng_set_size(memdbg.hdl, width, height);
 }
 
 /*
@@ -102,9 +99,7 @@ memdbg_window_destroy(GtkWidget *w, gpoi
 
 	if (memdbg.window)
 		memdbg.window = NULL;
-	while (memdbg.drawing)
-		usleep(1);
-	gtkdrawmng_release(memdbg.hdl);
+	drawmng_release(memdbg.hdl);
 	memdbg.hdl = NULL;
 }
 
@@ -123,6 +118,7 @@ memdbg_expose(GtkWidget *w, GdkEventExpo
 	return FALSE;
 }
 
+
 /*
  * memdbg Interface
  */
@@ -144,23 +140,22 @@ memdbg_create(void)
 	gtk_window_set_policy(GTK_WINDOW(memdbg.window), FALSE, FALSE, TRUE);
 	gtk_signal_connect(GTK_OBJECT(memdbg.window), "destroy",
 	    GTK_SIGNAL_FUNC(memdbg_window_destroy), NULL);
+	gtk_widget_realize(memdbg.window);
 
 	main_widget = gtk_vbox_new(FALSE, 2);
 	gtk_widget_show(main_widget);
 	gtk_container_add(GTK_CONTAINER(memdbg.window), main_widget);
 
-	memdbg.hdl = gtkdrawmng_create(memdbg.window, width, height);
+	memdbg.hdl = drawmng_create(memdbg.window, width, height);
 	if (memdbg.hdl == NULL) {
 		goto destroy;
 	}
 	gtk_box_pack_start(GTK_BOX(main_widget), memdbg.hdl->drawarea,
 	    FALSE, TRUE, 0);
 	gtk_widget_show(memdbg.hdl->drawarea);
-	gtk_widget_realize(memdbg.window);
 	gtk_signal_connect(GTK_OBJECT(memdbg.hdl->drawarea), "expose_event",
 	    GTK_SIGNAL_FUNC(memdbg_expose), NULL);
 
-	memdbg.drawing = FALSE;
 	gtk_widget_show(memdbg.window);
 
 	palfn.get8 = getpal8;