fixed wxrc's dependencies

[wxWidgets.git] / src / os2 / evtloop.cpp

diff --git a/src/os2/evtloop.cpp b/src/os2/evtloop.cpp
index 8ca8d5c0c02d5406b1b0ec45e093136bd0a87a07..38d378623b67351364f4817961d81d44661f78d4 100644 (file)
--- a/src/os2/evtloop.cpp
+++ b/src/os2/evtloop.cpp
@@ -191,8 +191,7 @@ bool wxEventLoopImpl::PreProcessMessage(QMSG *pMsg)
            for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
            {
                if((bRc = pWnd->OS2TranslateMessage((WXMSG*)pMsg)) == TRUE)
            for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
            {
                if((bRc = pWnd->OS2TranslateMessage((WXMSG*)pMsg)) == TRUE)

-                  return TRUE;
-              //  break;
+                   break;

            // stop at first top level window, i.e. don't try to process the
            // key strokes originating in a dialog using the accelerators of
            // the parent frame - this doesn't make much sense
            // stop at first top level window, i.e. don't try to process the
            // key strokes originating in a dialog using the accelerators of
            // the parent frame - this doesn't make much sense


@@ -228,7 +227,7 @@ bool wxEventLoopImpl::SendIdleMessage()
 // wxEventLoop implementation
 // ============================================================================
 
 // wxEventLoop implementation
 // ============================================================================
 

-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
+wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;

 
 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting
 
 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting


@@ -239,11 +238,6 @@ wxEventLoop::~wxEventLoop()
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 }
 
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 }
 

-bool wxEventLoop::IsRunning() const
-{
-    return m_impl != NULL;
-}
-

 //////////////////////////////////////////////////////////////////////////////
 //
 // Keep trying to process messages until WM_QUIT
 //////////////////////////////////////////////////////////////////////////////
 //
 // Keep trying to process messages until WM_QUIT


@@ -297,7 +291,7 @@ int wxEventLoop::Run()
         while ( !Pending() && m_impl->SendIdleMessage() )
        {
            wxTheApp->HandleSockets();
         while ( !Pending() && m_impl->SendIdleMessage() )
        {
            wxTheApp->HandleSockets();

-           wxUsleep(10);
+           wxMilliSleep(10);

        }
 
         wxTheApp->HandleSockets();
        }
 
         wxTheApp->HandleSockets();


@@ -310,7 +304,7 @@ int wxEventLoop::Run()
            }
        }
         else
            }
        }
         else

-            wxUsleep(10);
+            wxMilliSleep(10);

     }
 
     return m_impl->GetExitCode();
     }
 
     return m_impl->GetExitCode();