Backout last winRaiseWindow patch which caused stacking problems

diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog
index 478ef8d..21f653a 100644 (file)
--- a/hw/xwin/ChangeLog
+++ b/hw/xwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-03  Alexander Gottwald  <ago at freedesktop dot org>
+
+       * winmultiwindowwndproc.c:
+       * winblock.c:
+       Backout last winRaiseWindow patch which caused stacking problems
+
 2005-05-25  Alexander Gottwald  <ago at freedesktop dot org>
 
        * win.h:

diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c
index ec2d16e..1d21faf 100644 (file)
--- a/hw/xwin/winblock.c
+++ b/hw/xwin/winblock.c
@@ -41,8 +41,6 @@ extern HWND                   g_hDlgExit;
 extern HWND                    g_hDlgAbout;
 
 
-Bool winInBlockHandler = FALSE;
-
 /* See Porting Layer Definition - p. 6 */
 void
 winBlockHandler (int nScreen,
@@ -89,9 +87,6 @@ winBlockHandler (int nScreen,
 winBlockHandler_ProcessMessages:
 #endif
 
-
-
-  winInBlockHandler = TRUE;
   /* Process all messages on our queue */
   while (PeekMessage (&msg, NULL, 0, 0, PM_REMOVE))
     {
@@ -105,5 +100,4 @@ winBlockHandler_ProcessMessages:
          DispatchMessage (&msg);
        }
     }
-  winInBlockHandler = FALSE;
 }

diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index 56e5156..93ddcd4 100755 (executable)
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -266,11 +266,10 @@ ValidateSizing (HWND hwnd, WindowPtr pWin,
 }
 
 extern Bool winInDestroyWindowsWindow;
-extern Bool winInBlockHandler; 
 static Bool winInRaiseWindow = FALSE;
 static void winRaiseWindow(WindowPtr pWin)
 {
-  if (winInBlockHandler && !winInDestroyWindowsWindow && !winInRaiseWindow)
+  if (!winInDestroyWindowsWindow && !winInRaiseWindow)
   {
     BOOL oldstate = winInRaiseWindow;
     winInRaiseWindow = TRUE;