Changeset 3584 for trunk/src/user32/win32wbase.cpp

Timestamp:

May 22, 2000, 7:21:11 PM (25 years ago)

Author:

cbratschi

Message:

merged controls with Corel WINE 20000513, maximize/minimize fix

File:

• trunk/src/user32/win32wbase.cpp (modified) (22 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.191 2000-05-20 14:57:24 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.192 2000-05-22 17:21:11 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -208 +208 @@
     }
     if(propertyList) {
-        removeWindowProps();
+        removeWindowProps();
     }
 }
@@ -503 +503 @@
 #if 0
   if(((dwStyle & (WS_CAPTION|WS_POPUP)) == WS_CAPTION) && (getParent() == NULL || getParent() == windowDesktop)) {
-        fTaskList = TRUE;
+        fTaskList = TRUE;
   }
 #else
@@ -867 +867 @@
     //SvL: Don't send WM_(NC)ACTIVATE messages when the window is being destroyed
     if(fDestroyWindowCalled) {
-        return 0;
+        return 0;
     }
 
@@ -916 +916 @@
     //SvL: Don't send WM_(NC)ACTIVATE messages when the window is being destroyed
     if(fDestroyWindowCalled) {
-        return 0;
+        return 0;
     }
 
@@ -927 +927 @@
     //SvL: Don't send WM_(NC)ACTIVATE messages when the window is being destroyed
     if(fDestroyWindowCalled) {
-        return 0;
+        return 0;
     }
     return  SendInternalMessageA(WM_KILLFOCUS, hwnd, 0);
@@ -1056 +1056 @@
     RECT client = rectClient;
 
-        if ((rect.left >= client.left) && (rect.left < client.right) &&
+        if ((rect.left >= client.left) && (rect.left < client.right) &&
            (rect.right >= client.left) && (rect.right < client.right) &&
            (rect.top  >= client.top) && (rect.top < client.bottom) &&
            (rect.bottom >= client.top) && (rect.bottom < client.bottom))
         {
-                return 0;
-        }
-
-        dprintf(("MsgNCPaint (%d,%d)(%d,%d)", rect.left, rect.top, rect.right, rect.bottom));
-        hrgn = CreateRectRgnIndirect(&rect);
-        if (!hrgn) return 0;
-
-        rc = SendInternalMessageA(WM_NCPAINT,hrgn,0);
-
-        DeleteObject(hrgn);
-
-        return rc;
-  }
-  else  return 0;
+                return 0;
+        }
+
+        dprintf(("MsgNCPaint (%d,%d)(%d,%d)", rect.left, rect.top, rect.right, rect.bottom));
+        hrgn = CreateRectRgnIndirect(&rect);
+        if (!hrgn) return 0;
+
+        rc = SendInternalMessageA(WM_NCPAINT,hrgn,0);
+
+        DeleteObject(hrgn);
+
+        return rc;
+  }
+  else  return 0;
 }
 //******************************************************************************
@@ -1329 +1329 @@
         if ((dwStyle & WS_CAPTION) == WS_CAPTION)
         {
-//          HandleNCPaint((HRGN)1);
+          HandleNCPaint((HRGN)1);
           OSLibWinSetWindowText(OS2HwndFrame,(LPSTR)windowNameA);
         }
@@ -1638 +1638 @@
         if((HIWORD(lParam) & KEYDATA_ALT) && wParam)
         {
-                if (wParam == VK_TAB || wParam == VK_ESCAPE) 
-                        break;
+                if (wParam == VK_TAB || wParam == VK_ESCAPE)
+                        break;
                 if (wParam == VK_SPACE && (getStyle() & WS_CHILD)) {
-                        getParent()->SendMessageA(Msg, wParam, lParam );
-                }
+                        getParent()->SendMessageA(Msg, wParam, lParam );
+                }
                 else    SendMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)(DWORD)wParam );
         }
         else /* check for Ctrl-Esc */
-                if (wParam != VK_ESCAPE) MessageBeep(0);
-                        break;
+                if (wParam != VK_ESCAPE) MessageBeep(0);
+                        break;
     }
 
@@ -2037 +2037 @@
  ULONG showstate = 0;
  HWND  hWinAfter;
- BOOL  rc;
+ BOOL  rc,wasVisible,showFlag;
 
     dprintf(("ShowWindow %x %x", getWindowHandle(), nCmdShow));
@@ -2048 +2048 @@
         break;
     case SW_HIDE:
+        if (!wasVisible) return wasVisible;
+         if(GetCapture() == getWindowHandle() || IsChild(GetCapture()))
+           ReleaseCapture();
+
         showstate = SWPOS_HIDE;
         break;
@@ -2077 +2081 @@
 
     /* We can't activate a child window (WINE) */
-    if(getStyle() & WS_CHILD)
+    if((getStyle() & WS_CHILD) && !(getExStyle() & WS_EX_MDICHILD))
         showstate &= ~SWPOS_ACTIVATE;
 
@@ -2085 +2089 @@
     else    setStyle(getStyle() & ~WS_VISIBLE);
 
+    showFlag = (nCmdShow != SW_HIDE);
+
     rc = OSLibWinShowWindow(OS2HwndFrame, showstate);
     OSLibWinShowWindow(OS2Hwnd, showstate);
 
-    SendInternalMessageA(WM_SHOWWINDOW, (showstate & SWPOS_SHOW) ? 1 : 0, 0);
+    //CB: PMFrame: WM_MINMAXFRAME SWP_* handling isn't always successful!
+    if ((showstate & SWPOS_MAXIMIZE) == SWPOS_MAXIMIZE)
+      setStyle((getStyle() & ~WS_MINIMIZE) | WS_MAXIMIZE);
+    else if ((showstate & SWPOS_MINIMIZE) == SWPOS_MINIMIZE)
+      setStyle((getStyle() & ~WS_MAXIMIZE) | WS_MINIMIZE);
+    else if ((showstate & SWPOS_RESTORE) == SWPOS_RESTORE)
+      setStyle(getStyle() & ~(WS_MINIMIZE | WS_MAXIMIZE));
 
     if (flags & WIN_NEED_SIZE)
@@ -2140 +2152 @@
     else
     {
-        if (!(fuFlags & SWP_SHOWWINDOW)) 
-              fuFlags |= SWP_NOREDRAW;
-        fuFlags &= ~SWP_HIDEWINDOW;
-    }
-
-    if(cx < 0) cx = 0; 
+        if (!(fuFlags & SWP_SHOWWINDOW))
+              fuFlags |= SWP_NOREDRAW;
+        fuFlags &= ~SWP_HIDEWINDOW;
+    }
+
+    if(cx < 0) cx = 0;
     if(cy < 0) cy = 0;
 
@@ -2159 +2171 @@
         fuFlags |= SWP_NOACTIVATE;   /* Already active */
     }
-    else 
+    else
     if((getStyle() & (WS_POPUP | WS_CHILD)) != WS_CHILD )
     {
@@ -2165 +2177 @@
         {
             fuFlags &= ~SWP_NOZORDER;
-            hwndInsertAfter = HWND_TOP;           
+            hwndInsertAfter = HWND_TOP;
         }
     }
@@ -2219 +2231 @@
 
     if(fuFlags & SWP_SHOWWINDOW && !IsWindowVisible()) {
-        setStyle(getStyle() | WS_VISIBLE);
-        //SvL: TODO: Send WM_SHOWWINDOW??
-        OSLibWinShowWindow(OS2Hwnd, SWPOS_SHOW);
+        setStyle(getStyle() | WS_VISIBLE);
+        //SvL: TODO: Send WM_SHOWWINDOW??
+        OSLibWinShowWindow(OS2Hwnd, SWPOS_SHOW);
     }
     else
     if(fuFlags & SWP_HIDEWINDOW && IsWindowVisible()) {
-        setStyle(getStyle() & ~WS_VISIBLE);
-        //SvL: TODO: Send WM_SHOWWINDOW??
-        OSLibWinShowWindow(OS2Hwnd, SWPOS_HIDE);
+        setStyle(getStyle() & ~WS_VISIBLE);
+        //SvL: TODO: Send WM_SHOWWINDOW??
+        OSLibWinShowWindow(OS2Hwnd, SWPOS_HIDE);
     }
     rc = OSLibWinSetMultWindowPos(&swp, 1);
@@ -2233 +2245 @@
 #ifdef DEBUG
     if(fShow) {
-        dprintf(("Frame style 0x%08x, client style 0x%08x", OSLibQueryWindowStyle(OS2HwndFrame), OSLibQueryWindowStyle(OS2Hwnd)));
+        dprintf(("Frame style 0x%08x, client style 0x%08x", OSLibQueryWindowStyle(OS2HwndFrame), OSLibQueryWindowStyle(OS2Hwnd)));
     }
 #endif
@@ -2306 +2318 @@
     {
         SetWindowPos(0, 0, 0, 0, 0, SWP_HIDEWINDOW |
-                     SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE);
+                     SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE);
         if(!::IsWindow(hwnd))
         {
-                return TRUE;
+                return TRUE;
         }
     }
@@ -2674 +2686 @@
   rc = (getStyle() & WS_DISABLED) != 0;
   if(rc && !fEnable) {
-        SendMessageA(WM_CANCELMODE, 0, 0);
+        SendMessageA(WM_CANCELMODE, 0, 0);
   }
   OSLibWinEnableWindow(OS2HwndFrame, fEnable);
   if(fEnable == FALSE) {
-        //SvL: No need to clear focus as PM already does this
-        if(getWindowHandle() == GetCapture()) {
-                ReleaseCapture();  /* A disabled window can't capture the mouse */
-                dprintf(("Released capture for window %x that is being disabled", getWindowHandle()));
-        }
+        //SvL: No need to clear focus as PM already does this
+        if(getWindowHandle() == GetCapture()) {
+                ReleaseCapture();  /* A disabled window can't capture the mouse */
+                dprintf(("Released capture for window %x that is being disabled", getWindowHandle()));
+        }
   }
   return rc;
@@ -2984 +2996 @@
 }
 //******************************************************************************
-//Note: Should return NULL if window is frame window! (IsOS2FrameWindowHandle depends on this 
+//Note: Should return NULL if window is frame window! (IsOS2FrameWindowHandle depends on this
 //      behaviour)
 //******************************************************************************
@@ -3060 +3072 @@
 
     if(window->getOS2FrameWindowHandle() == hwndOS2) {
-        return TRUE;
+        return TRUE;
     }
     return FALSE;