From bf68113e5fa5c2d231dee1b3bbce41d2ccf6f72b Mon Sep 17 00:00:00 2001 From: "pavlov%netscape.com" Date: Sun, 16 Dec 2001 11:18:27 +0000 Subject: [PATCH] fixing os2 bustage (bogus #include for some #if0'd code from windows) git-svn-id: svn://10.0.0.236/trunk@110576 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/src/os2/nsAppShell.cpp | 33 --------------------------- 1 file changed, 33 deletions(-) diff --git a/mozilla/widget/src/os2/nsAppShell.cpp b/mozilla/widget/src/os2/nsAppShell.cpp index 9f9c2d663f1..013a7ca746d 100644 --- a/mozilla/widget/src/os2/nsAppShell.cpp +++ b/mozilla/widget/src/os2/nsAppShell.cpp @@ -27,11 +27,8 @@ #include "nsIEventQueueService.h" #include "nsIServiceManager.h" #include "nsWidgetsCID.h" -#include "nsITimer.h" -#include "nsITimerQueue.h" static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_CID(kTimerManagerCID, NS_TIMERMANAGER_CID); // Appshell manager. Same threads must get the same appshell object, // or else the message queue will be taken over by the second (nested) @@ -153,12 +150,6 @@ nsresult nsAppShell::Run() NS_ADDREF_THIS(); int keepGoing = 1; -#if 0 - nsresult rv; - nsCOMPtr queue(do_GetService(kTimerManagerCID, &rv)); - if (NS_FAILED(rv)) return rv; -#endif - // Process messages do { // Give priority to system messages (in particular keyboard, mouse, @@ -182,15 +173,6 @@ nsresult nsAppShell::Run() } } -#if 0 - // process timer queue. - } else if (queue->HasReadyTimers(NS_PRIORITY_LOWEST)) { - - do { - queue->FireNextReadyTimer(NS_PRIORITY_LOWEST); - } while (queue->HasReadyTimers(NS_PRIORITY_LOWEST) && - !WinPeekMsg((HAB)0, &mQmsg, NULL, 0, 0, PM_NOREMOVE)); -#endif } else { // Block and wait for any posted application message WinWaitMsg((HAB)0, 0, 0); @@ -243,12 +225,6 @@ nsresult nsAppShell::GetNativeEvent( PRBool &aRealEvent, void *&aEvent) { PRBool gotMessage = PR_FALSE; -#if 0 - nsresult rv; - nsCOMPtr queue(do_GetService(kTimerManagerCID, &rv)); - if (NS_FAILED(rv)) return rv; -#endif - do { // Give priority to system messages (in particular keyboard, mouse, // timer, and paint messages). @@ -259,15 +235,6 @@ nsresult nsAppShell::GetNativeEvent( PRBool &aRealEvent, void *&aEvent) gotMessage = PR_TRUE; -#if 0 - // process timer queue. - } else if (queue->HasReadyTimers(NS_PRIORITY_LOWEST)) { - - do { - queue->FireNextReadyTimer(NS_PRIORITY_LOWEST); - } while (queue->HasReadyTimers(NS_PRIORITY_LOWEST) && - !WinPeekMsg((HAB)0, &mQmsg, NULL, 0, 0, PM_NOREMOVE)); -#endif } else { // Block and wait for any posted application message WinWaitMsg((HAB)0, 0, 0);