commit 68dd6790433fcea1069fecebba1baae78c9d6054
author Lawson Whitney <lawson_whitney@juno.com> Sun Jun 25 12:53:27 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Jun 25 12:53:27 2000 +0000
tree f717551ef5b9e73dcc5f68bf8f1704e69f9a6399
parent 12298c5cad62d0b7aaa6d57fdfcbc110a681f578

Moved zero-sized window hack to x11drv.

windows/win.c

diff --git a/windows/win.c b/windows/win.c
index 5eb31a9..dce2b1a 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -891,16 +891,8 @@
         if (cs->cy < minTrack.y ) cs->cy = minTrack.y;
     }
 
-    if(cs->style & WS_CHILD)
-    {
-        if(cs->cx < 0) cs->cx = 0;
-        if(cs->cy < 0) cs->cy = 0;
-    }
-    else
-    {
-        if (cs->cx <= 0) cs->cx = 1;
-        if (cs->cy <= 0) cs->cy = 1;
-    }
+    if (cs->cx < 0) cs->cx = 0;
+    if (cs->cy < 0) cs->cy = 0;
 
     wndPtr->rectWindow.left   = cs->x;
     wndPtr->rectWindow.top    = cs->y;

windows/x11drv/wnd.c

diff --git a/windows/x11drv/wnd.c b/windows/x11drv/wnd.c
index 0418f7f..a8ae0e5 100644
--- a/windows/x11drv/wnd.c
+++ b/windows/x11drv/wnd.c
@@ -301,6 +301,14 @@
       ((X11DRV_WND_DATA *) wndPtr->pDriverData)->hWMIconBitmap = 0;
       ((X11DRV_WND_DATA *) wndPtr->pDriverData)->hWMIconMask = 0;
       ((X11DRV_WND_DATA *) wndPtr->pDriverData)->bit_gravity = win_attr.bit_gravity;
+
+      /* Zero-size X11 window hack.  X doesn't like them, and will crash */
+      /* with a BadValue unless we do something ugly like this. */
+      /* FIXME:  there must be a better way.  */
+        if (cs->cx <= 0) cs->cx = 1;
+        if (cs->cy <= 0) cs->cy = 1;
+      /* EMXIF */
+
       ((X11DRV_WND_DATA *) wndPtr->pDriverData)->window = 
 	TSXCreateWindow( display, X11DRV_GetXRootWindow(), 
 			 cs->x, cs->y, cs->cx, cs->cy,