[xorg-commit-diffs] xc/programs/Xserver/hw/xwin winmultiwindowwndproc.c, 1.1.6.13, 1.1.6.14

[Takuma Murakami]

Committed by: takuma


Index: winmultiwindowwndproc.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v
retrieving revision 1.1.6.13
retrieving revision 1.1.6.14
diff -u -d -r1.1.6.13 -r1.1.6.14
--- a/winmultiwindowwndproc.c	25 Mar 2004 12:43:39 -0000	1.1.6.13
+++ b/winmultiwindowwndproc.c	30 Mar 2004 08:28:59 -0000	1.1.6.14
@@ -742,7 +742,8 @@
 	  /* Tell our Window Manager thread to activate the window */
 	  wmMsg.msg = WM_WM_ACTIVATE;
 	  if (fWMMsgInitialized)
-	    winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
+	    if (!pWin || !pWin->overrideRedirect) /* for OOo menus */
+	      winSendMessageToWM (s_pScreenPriv->pWMInfo, &wmMsg);
 	}
       return 0;