Changeset 9785 for trunk/src

Timestamp:

Feb 11, 2003, 3:20:01 PM (23 years ago)

Author:

sandervl

Message:

When a window is activated by a mouse click, we must set focus to the client window (and not the frame..)

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (9 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.196 2003-02-10 18:31:45 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.197 2003-02-11 14:20:01 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -257 +257 @@
 } /* End of main */
 //******************************************************************************
-#ifdef NEW_WGSS
 HBITMAP OPEN32API _O32_CreateBitmapFromPMHandle(HBITMAP hPMBitmap);
 
@@ -270 +269 @@
     return yyrc;
 }
-#endif
 //******************************************************************************
 static void QueryPMMenuBitmaps()
@@ -300 +298 @@
         hbmFrameMenu[PMMENU_CLOSEBUTTONDOWN] = GpiLoadBitmap(hdc, hModDisplay, SBMP_CLOSEDEP, 0, 0);
 
-#ifdef NEW_WGSS
         //Create win32 bitmap handles of the OS/2 min, max and restore buttons
         hBmpMinButton     = O32_CreateBitmapFromPMHandle(hbmFrameMenu[PMMENU_MINBUTTON]);
@@ -310 +307 @@
         hBmpCloseButton   = O32_CreateBitmapFromPMHandle(hbmFrameMenu[PMMENU_CLOSEBUTTON]);
         hBmpCloseButtonDown   = O32_CreateBitmapFromPMHandle(hbmFrameMenu[PMMENU_CLOSEBUTTONDOWN]);
-#endif
         DevCloseDC(hdc);
     }
@@ -714 +710 @@
       HWND hwndFocus = (HWND)mp1;
 
-        dprintf(("OS2: WM_SETFOCUS %x %x (%x) %d", win32wnd->getWindowHandle(), mp1, OS2ToWin32Handle(hwndFocus), mp2));
+        dprintf(("OS2: WM_SETFOCUS %x %x (%x) %d cur focus %x", win32wnd->getWindowHandle(), mp1, OS2ToWin32Handle(hwndFocus), mp2, WinQueryFocus(HWND_DESKTOP)));
 
         //PM doesn't allow SetFocus calls during WM_SETFOCUS message processing;
@@ -808 +804 @@
 
     case WM_CHAR:
-        dprintf(("OS2: WM_CHAR %x %x %x, %x %x", win32wnd->getWindowHandle(), mp1, mp2, pWinMsg->wParam, pWinMsg->lParam));
+        dprintf(("OS2: WM_CHAR %x %x %x, %x %x focus wnd %x", win32wnd->getWindowHandle(), mp1, mp2, pWinMsg->wParam, pWinMsg->lParam, WinQueryFocus(HWND_DESKTOP)));
         win32wnd->MsgChar(pWinMsg);
         break;
@@ -1578 +1574 @@
                     //    -> problems with update region if we don't do it
                     //       todo: rewrite whole handling
+                    dprintf(("PMFRAME: WM_WINDOWPOSCHANGED invalidate all"));
                     WinInvalidateRect(hwnd,NULL,TRUE);
                 }
@@ -1764 +1761 @@
     case WM_SETFOCUS:
     {
-        dprintf(("PMFRAME: WM_SETFOCUS %x %x", win32wnd->getWindowHandle(), hwnd));
+        dprintf(("PMFRAME: WM_SETFOCUS %x %x %d -> %x", win32wnd->getWindowHandle(), hwnd, mp2, mp1));
         goto RunDefFrameWndProc;
     }

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.356 2003-02-10 19:10:22 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.357 2003-02-11 14:20:01 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1182 +1182 @@
                     //SvL: Calling OSLibSetActiveWindow(hwndTop); causes focus problems
                     if (win32top) {
-                        OSLibWinSetFocus(win32top->getOS2FrameWindowHandle());
+                        //Must use client window handle (not frame!!)
+                        OSLibWinSetFocus(win32top->getOS2WindowHandle());
                         RELEASE_WNDOBJ(win32top);
                     }