Changeset 2956 for trunk/src/user32/win32wbasenonclient.cpp

Timestamp:

Mar 1, 2000, 2:30:07 PM (25 years ago)

Author:

sandervl

Message:

focus fixes + changes for dinput

File:

• trunk/src/user32/win32wbasenonclient.cpp (modified) (2 diffs)

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.15 2000-02-23 17:05:19 cbratschi Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.16 2000-03-01 13:30:06 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -260 +260 @@
       Win32BaseWindow *topparent = GetTopParent();
 
-      if (GetActiveWindow() != topparent->getWindowHandle())
-        topparent->SetActiveWindow();
-
-      if (GetActiveWindow() == topparent->getWindowHandle())
-        SendInternalMessageA(WM_SYSCOMMAND,SC_MOVE+HTCAPTION,lParam);
-      break;
+        if (GetActiveWindow() != topparent->getWindowHandle())
+        {
+            //SvL: Calling topparent->SetActiveWindow() causes focus problems
+            OSLibWinSetFocus(topparent->getOS2FrameWindowHandle());
+        }
+
+        if (GetActiveWindow() == topparent->getWindowHandle())
+            SendInternalMessageA(WM_SYSCOMMAND,SC_MOVE+HTCAPTION,lParam);
+        break;
     }