Changeset 5692 for trunk/src

Timestamp:

May 11, 2001, 9:02:01 PM (24 years ago)

Author:

sandervl

Message:

WM_ADJUSTFRAMEPOS fix; don't call frame handler

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.100 2001-05-11 13:31:54 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.101 2001-05-11 19:02:01 sandervl Exp $ */
 
 /*
@@ -722 +722 @@
             dprintf (("BeginPaint %x: EMPTY update rectangle (show=%d/%d vis=%d/%d", hWnd,  WinIsWindowVisible(wnd->getOS2FrameWindowHandle()), WinIsWindowVisible(wnd->getOS2WindowHandle()),  WinIsWindowShowing(wnd->getOS2FrameWindowHandle()), WinIsWindowShowing(wnd->getOS2WindowHandle())));
         }
+        else dprintf (("BeginPaint %x: (show=%d/%d vis=%d/%d)", hWnd,  WinIsWindowVisible(wnd->getOS2FrameWindowHandle()), WinIsWindowVisible(wnd->getOS2WindowHandle()),  WinIsWindowShowing(wnd->getOS2FrameWindowHandle()), WinIsWindowShowing(wnd->getOS2WindowHandle())));
+
         selectClientArea(wnd, pHps);
 

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.125 2001-05-11 08:39:44 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.126 2001-05-11 19:02:01 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1251 +1251 @@
 
         dprintf(("PMFRAME:WM_ADJUSTFRAMEPOS %x %x %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), pswp->hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
-        goto RunDefFrameWndProc;
+//Calling the default frame handler changes the Z-order of this window when
+//setting the focus. Messes up hotlist window in Opera 5.
+//Also gets rid of focus problems in e.g. button (open odin info dialog ->
+//close, focus back to button dialog now)
+//        goto RunDefFrameWndProc;
+        break;
     }