Changeset 3584 for trunk/src/user32/pmframe.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/pmframe.cpp (modified) (7 diffs)

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.53 2000-05-12 18:09:41 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.54 2000-05-22 17:21:10 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -168 +168 @@
     case WM_HITTEST:
     {
-        if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
-                win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
-        }
+        if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
+                win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
+        }
         if(win32wnd && win32wnd->IsWindowCreated())
         {
@@ -192 +192 @@
     case WM_BUTTON3DBLCLK:
     {
-        if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
-                win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
-        }
+        if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
+                win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
+        }
         if(win32wnd && win32wnd->IsWindowCreated())
         {
@@ -217 +217 @@
     case WM_MOUSEMOVE:
     {
-        if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
-                win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
-        }
+        if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
+                win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
+        }
         if(win32wnd && win32wnd->IsWindowCreated())
-                win32wnd->MsgMouseMove(pWinMsg);
+                win32wnd->MsgMouseMove(pWinMsg);
         RestoreOS2TIB();
         return (MRESULT)TRUE;
@@ -230 +230 @@
         dprintf(("PMFRAME: WM_PAINT"));
         if(win32wnd->getStyle() & WS_MINIMIZE_W)
-                goto RunDefFrameProc;
+                goto RunDefFrameProc;
         if(win32wnd->IsWindowCreated())
-                win32wnd->MsgNCPaint();
+                win32wnd->MsgNCPaint();
 
         goto RunDefWndProc;
@@ -441 +441 @@
 
     case WM_SHOW:
-        dprintf(("PMFRAME: WM_SHOW"));
+        dprintf(("PMFRAME: WM_SHOW"));
         break;
 
@@ -497 +497 @@
 
     case WM_VRNENABLED:
-        if(!win32wnd->isComingToTop() && ((win32wnd->getExStyle() & WS_EX_TOPMOST_W) == WS_EX_TOPMOST_W))
-        {
-                HWND hwndrelated;
-                Win32BaseWindow *topwindow;
-
-                win32wnd->setComingToTop(TRUE);
-
-                hwndrelated = WinQueryWindow(hwnd, QW_PREV);
-                dprintf(("WM_VRNENABLED hwndrelated = %x (hwnd=%x)", hwndrelated, hwnd));
-                topwindow = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndrelated);
-                if(topwindow == NULL || ((win32wnd->getExStyle() & WS_EX_TOPMOST_W) == 0)) {
-                        //put window at the top of z order
-                        WinSetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_ZORDER );
-                }
-
-                win32wnd->setComingToTop(FALSE);
-                break;
-        }
-        goto RunDefFrameProc;
+        if(!win32wnd->isComingToTop() && ((win32wnd->getExStyle() & WS_EX_TOPMOST_W) == WS_EX_TOPMOST_W))
+        {
+                HWND hwndrelated;
+                Win32BaseWindow *topwindow;
+
+                win32wnd->setComingToTop(TRUE);
+
+                hwndrelated = WinQueryWindow(hwnd, QW_PREV);
+                dprintf(("WM_VRNENABLED hwndrelated = %x (hwnd=%x)", hwndrelated, hwnd));
+                topwindow = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndrelated);
+                if(topwindow == NULL || ((win32wnd->getExStyle() & WS_EX_TOPMOST_W) == 0)) {
+                        //put window at the top of z order
+                        WinSetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_ZORDER );
+                }
+
+                win32wnd->setComingToTop(FALSE);
+                break;
+        }
+        goto RunDefFrameProc;
 
     default: