From a8b8700c7345b89953c8b63cb5c347a95e6ab988 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon, 21 Apr 2008 23:44:37 -0700
Subject: [PATCH] XQuartz: Fixed cmd-tab to bring all windows forward. (cherry
 picked from commit e48e2ce931228f4dfa36c39b8ec8c72a58025b1b)

---
 hw/xquartz/X11Application.m | 3 ++-
 hw/xquartz/X11Controller.m  | 6 ------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 3df19de18..265819af6 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -264,7 +264,8 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 				_appFlags._active = YES;
 
 				[self activateX:YES];
-				if ([e data2] & 0x10) X11ApplicationSetFrontProcess();
+				if ([e data2] & 0x10) 
+                    DarwinSendDDXEvent(kXquartzBringAllToFront, 0);
 			}
 			break;
 
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 98cb395a2..8dfe4b342 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -754,12 +754,6 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
     return YES;
 }
 
-- (OSX_BOOL) applicationShouldHandleReopen:(NSApplication *)app
-                     hasVisibleWindows:(OSX_BOOL)hasVis {
-    DarwinSendDDXEvent(kXquartzBringAllToFront, 0);
-    return YES;
-}
-
 @end
 
 void X11ControllerMain(int argc, const char **argv, void (*server_thread) (void *), void *server_arg) {