From edbcac6ce69ef602fe3970826d209e6e527b7885 Mon Sep 17 00:00:00 2001
From: "radha%netscape.com"
 <radha%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 23 Jan 1999 00:52:01 +0000
Subject: [PATCH] gWebShell_UnixEventQueue is gone. Use the Event queue service
 instead

git-svn-id: svn://10.0.0.236/trunk@18386 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsWebShell.cpp | 22 +++++++++-------------
 mozilla/webshell/src/nsWebShell.cpp  | 22 +++++++++-------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 4be14d773f3..d3ee0a3e41b 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -92,17 +92,17 @@ static PRLogModuleInfo* gLogModule = PR_NewLogModule("webshell");
 #endif
 
 
-#if XP_UNIX
-  // XXX. This should be changed. 
-  // Allow the event queue to be setup from outside
-  // the webshell.
+#if OLD_EVENT_QUEUE
+  /* The following is not used for the GTK version of the browser.
+   * It is still lurking around  for Motif 
+   */
 PLEventQueue* gWebShell_UnixEventQueue;
 
 void nsWebShell_SetUnixEventQueue(PLEventQueue* aEventQueue)
 {
   gWebShell_UnixEventQueue = aEventQueue;
 }
-#endif
+#endif  /* OLD_EVENT_QUEUE  */
 #if XP_MAC
 // This has all the same problems as the above
 extern "C" PLEventQueue* GetMacPLEventQueue();
@@ -1655,17 +1655,13 @@ OnLinkClickEvent::OnLinkClickEvent(nsWebShell* aHandler,
                (PLHandleEventProc) ::HandlePLEvent,
                (PLDestroyEventProc) ::DestroyPLEvent);
 
-// XXX: These ifdefs should all be replaced by the code in the XP_PC case when
-//      all platforms can use the EventQueueService...
-#ifdef XP_PC 
-  eventQueue = aHandler->GetEventQueue();
-#endif
+// XXX: The MAC ifdef should be replaced by the one in #else when
+// it uses EventQueueService...
 
-#ifdef XP_UNIX
-  eventQueue = gWebShell_UnixEventQueue;
-#endif
 #ifdef XP_MAC 
 	eventQueue = GetMacPLEventQueue();
+#else
+  eventQueue = aHandler->GetEventQueue();
 #endif
 
 	PL_PostEvent(eventQueue, this);
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index 4be14d773f3..d3ee0a3e41b 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -92,17 +92,17 @@ static PRLogModuleInfo* gLogModule = PR_NewLogModule("webshell");
 #endif
 
 
-#if XP_UNIX
-  // XXX. This should be changed. 
-  // Allow the event queue to be setup from outside
-  // the webshell.
+#if OLD_EVENT_QUEUE
+  /* The following is not used for the GTK version of the browser.
+   * It is still lurking around  for Motif 
+   */
 PLEventQueue* gWebShell_UnixEventQueue;
 
 void nsWebShell_SetUnixEventQueue(PLEventQueue* aEventQueue)
 {
   gWebShell_UnixEventQueue = aEventQueue;
 }
-#endif
+#endif  /* OLD_EVENT_QUEUE  */
 #if XP_MAC
 // This has all the same problems as the above
 extern "C" PLEventQueue* GetMacPLEventQueue();
@@ -1655,17 +1655,13 @@ OnLinkClickEvent::OnLinkClickEvent(nsWebShell* aHandler,
                (PLHandleEventProc) ::HandlePLEvent,
                (PLDestroyEventProc) ::DestroyPLEvent);
 
-// XXX: These ifdefs should all be replaced by the code in the XP_PC case when
-//      all platforms can use the EventQueueService...
-#ifdef XP_PC 
-  eventQueue = aHandler->GetEventQueue();
-#endif
+// XXX: The MAC ifdef should be replaced by the one in #else when
+// it uses EventQueueService...
 
-#ifdef XP_UNIX
-  eventQueue = gWebShell_UnixEventQueue;
-#endif
 #ifdef XP_MAC 
 	eventQueue = GetMacPLEventQueue();
+#else
+  eventQueue = aHandler->GetEventQueue();
 #endif
 
 	PL_PostEvent(eventQueue, this);