diff --git a/docshell/base/nsWebShell.cpp b/docshell/base/nsWebShell.cpp index 4f094cb6f8ec..3a13414834db 100644 --- a/docshell/base/nsWebShell.cpp +++ b/docshell/base/nsWebShell.cpp @@ -110,10 +110,7 @@ void nsWebShell_SetUnixEventQueue(PLEventQueue* aEventQueue) gWebShell_UnixEventQueue = aEventQueue; } #endif /* OLD_EVENT_QUEUE */ -#if XP_MAC -// This has all the same problems as the above -extern "C" PLEventQueue* GetMacPLEventQueue(); -#endif + //---------------------------------------------------------------------- @@ -1855,14 +1852,9 @@ OnLinkClickEvent::OnLinkClickEvent(nsWebShell* aHandler, (PLHandleEventProc) ::HandlePLEvent, (PLDestroyEventProc) ::DestroyPLEvent); -// XXX: The MAC ifdef should be replaced by the one in #else when -// it uses EventQueueService... -#ifdef XP_MAC - eventQueue = GetMacPLEventQueue(); -#else eventQueue = aHandler->GetEventQueue(); -#endif + PL_PostEvent(eventQueue, this); } diff --git a/webshell/src/nsWebShell.cpp b/webshell/src/nsWebShell.cpp index 4f094cb6f8ec..3a13414834db 100644 --- a/webshell/src/nsWebShell.cpp +++ b/webshell/src/nsWebShell.cpp @@ -110,10 +110,7 @@ void nsWebShell_SetUnixEventQueue(PLEventQueue* aEventQueue) gWebShell_UnixEventQueue = aEventQueue; } #endif /* OLD_EVENT_QUEUE */ -#if XP_MAC -// This has all the same problems as the above -extern "C" PLEventQueue* GetMacPLEventQueue(); -#endif + //---------------------------------------------------------------------- @@ -1855,14 +1852,9 @@ OnLinkClickEvent::OnLinkClickEvent(nsWebShell* aHandler, (PLHandleEventProc) ::HandlePLEvent, (PLDestroyEventProc) ::DestroyPLEvent); -// XXX: The MAC ifdef should be replaced by the one in #else when -// it uses EventQueueService... -#ifdef XP_MAC - eventQueue = GetMacPLEventQueue(); -#else eventQueue = aHandler->GetEventQueue(); -#endif + PL_PostEvent(eventQueue, this); }