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

Timestamp:

Mar 18, 2002, 4:26:30 PM (23 years ago)

Author:

sandervl

Message:

PF: CloseWindow + GetWindowPlacement change/fix

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.316 2002-03-07 19:41:18 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.317 2002-03-18 15:26:30 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2653 +2653 @@
    wndpl->ptMaxPosition    = windowpos.ptMaxPosition;
    //Must be in parent coordinates (or screen if no parent); verified in NT4, SP6
-   wndpl->rcNormalPosition = rectWindow;
+   wndpl->rcNormalPosition = windowpos.rcNormalPosition;
 
    return TRUE;
@@ -3348 +3348 @@
 BOOL Win32BaseWindow::CloseWindow()
 {
-  return OSLibWinMinimizeWindow(getOS2FrameWindowHandle());
+     if (::GetWindowLongW( getWindowHandle() , GWL_STYLE ) & WS_CHILD) return FALSE;
+     ShowWindow( SW_MINIMIZE );
+     return TRUE;
 }
 //******************************************************************************