# HG changeset patch
# User stephent
# Date 1026273285 0
# Node ID 44e6e64b1cf2ae5dca44f4eb9cff00e3963e28f0
# Parent  89db3de0165de2a1e90a6f53975fe07bf906b12f
[xemacs-hg @ 2002-07-10 03:54:43 by stephent]
correct subwindow (un)mapping <170e9b58-0fab-45ca-af95-baf53a643dec@deisui.org>

diff -r 89db3de0165d -r 44e6e64b1cf2 src/ChangeLog
--- a/src/ChangeLog	Tue Jul 09 11:58:30 2002 +0000
+++ b/src/ChangeLog	Wed Jul 10 03:54:45 2002 +0000
@@ -1,3 +1,8 @@
+2002-07-08  Daiki Ueno  <daiki@xemacs.org>
+
+	* glyphs-x.c (x_unmap_subwindow): Deal with the substantial windows.
+	(x_map_subwindow): Likewise.
+
 2002-07-08  Mike Sperber <mike@xemacs.org>
 
 	* text.h: Only include wchar.h if we have it; define wcslen
diff -r 89db3de0165d -r 44e6e64b1cf2 src/glyphs-x.c
--- a/src/glyphs-x.c	Tue Jul 09 11:58:30 2002 +0000
+++ b/src/glyphs-x.c	Wed Jul 10 03:54:45 2002 +0000
@@ -2028,6 +2028,9 @@
       XUnmapWindow
 	(IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
 	 IMAGE_INSTANCE_X_CLIPWINDOW (p));
+      XUnmapSubwindows
+	(IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
+	 IMAGE_INSTANCE_X_CLIPWINDOW (p));
     }
   else				/* must be a widget */
     {
@@ -2057,8 +2060,12 @@
       XMoveWindow (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
 		   subwindow, -dga->xoffset, -dga->yoffset);
       if (!IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (p))
-	XMapWindow (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
-		    IMAGE_INSTANCE_X_CLIPWINDOW (p));
+	{
+	  XMapWindow (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
+		      IMAGE_INSTANCE_X_CLIPWINDOW (p));
+	  XMapSubwindows (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
+			  IMAGE_INSTANCE_X_CLIPWINDOW (p));
+	}
     }
   else				/* must be a widget */
     {