XSetInputFocus on WM_ACTIVATEwindow-raising-rework

1 files changed, 6 insertions, 6 deletions

diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index e4b525476..50c8ea798 100644
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -690,12 +690,6 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
       if (g_fKeyboardHookLL)
 	g_fKeyboardHookLL = winInstallKeyboardHookLL ();
 
-      /* Tell our Window Manager thread to XSetInputFocus the X window */
-      wmMsg.msg = WM_WM_ACTIVATE;
-      if (fWMMsgInitialized)
-        if (!pWin || !pWin->overrideRedirect) /* for OOo menus */
-          winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
-
       return 0;
 
     case WM_KILLFOCUS:
@@ -790,6 +784,12 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 
     case WM_ACTIVATE:
 
+      /* Tell our Window Manager thread to XSetInputFocus the X window */
+      wmMsg.msg = WM_WM_ACTIVATE;
+      if (fWMMsgInitialized)
+        if (!pWin)
+          winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
+
       /* Pass the message to the root window */
       SendMessage (hwndScreen, message, wParam, lParam);