Fix VC++ compile error

[wxWidgets.git] / src / osx / core / evtloop_cf.cpp

diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp
index 429312ac8871b2c570a716bfb6808859e0047ed4..6dc470f8174d0d0ef5830b135d367f628991acbc 100644 (file)
--- a/src/osx/core/evtloop_cf.cpp
+++ b/src/osx/core/evtloop_cf.cpp
@@ -39,6 +39,10 @@
 #include "wx/osx/private.h"
 #include "wx/osx/core/cfref.h"
 
+#if wxUSE_GUI
+    #include "wx/nonownedwnd.h"
+#endif
+
 // ============================================================================
 // wxCFEventLoopSource and wxCFEventLoop implementation
 // ============================================================================
@@ -142,14 +146,14 @@ wxCFEventLoop::AddSourceForFD(int WXUNUSED(fd),
 
 #endif // wxUSE_EVENTLOOP_SOURCE
 
-void wxObserverCallBack(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info)
+extern "C" void wxObserverCallBack(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info)
 {
     wxCFEventLoop * eventloop = static_cast<wxCFEventLoop *>(info);
     if ( eventloop )
         eventloop->ObserverCallBack(observer, activity);
-}        
+}
 
-void wxCFEventLoop::ObserverCallBack(CFRunLoopObserverRef observer, int activity)
+void wxCFEventLoop::ObserverCallBack(CFRunLoopObserverRef WXUNUSED(observer), int activity)
 {
     if ( activity & kCFRunLoopBeforeTimers )
     {
@@ -164,7 +168,7 @@ void wxCFEventLoop::ObserverCallBack(CFRunLoopObserverRef observer, int activity
         if ( wxTheApp )
             wxTheApp->ProcessPendingEvents();
     }
-    
+
     if ( activity & kCFRunLoopBeforeWaiting )
     {
         if ( ProcessIdle() )
@@ -185,19 +189,23 @@ void wxCFEventLoop::ObserverCallBack(CFRunLoopObserverRef observer, int activity
 wxCFEventLoop::wxCFEventLoop()
 {
     m_shouldExit = false;
-    
+
+    m_runLoop = CFGetCurrentRunLoop();
+
     CFRunLoopObserverContext ctxt;
     bzero( &ctxt, sizeof(ctxt) );
     ctxt.info = this;
-    m_runLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0, 
-                                                wxObserverCallBack, &ctxt );
-    CFRunLoopAddObserver(CFGetCurrentRunLoop(), m_runLoopObserver, kCFRunLoopDefaultMode);
+    m_runLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0,
+                                            wxObserverCallBack, &ctxt );
+    CFRunLoopAddObserver(m_runLoop, m_runLoopObserver, kCFRunLoopCommonModes);
+    CFRelease(m_runLoopObserver);
 }
 
 wxCFEventLoop::~wxCFEventLoop()
 {
+    CFRunLoopRemoveObserver(m_runLoop, m_runLoopObserver, kCFRunLoopCommonModes);
 }
-                        
+
 
 CFRunLoopRef wxCFEventLoop::CFGetCurrentRunLoop() const
 {
@@ -206,11 +214,21 @@ CFRunLoopRef wxCFEventLoop::CFGetCurrentRunLoop() const
 
 void wxCFEventLoop::WakeUp()
 {
-    extern void wxMacWakeUp();
+    CFRunLoopWakeUp(m_runLoop);
+}
+
+#if wxUSE_BASE
+
+void wxMacWakeUp()
+{
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
     
-    wxMacWakeUp();
+    if ( loop )
+        loop->WakeUp();
 }
 
+#endif
+
 bool wxCFEventLoop::YieldFor(long eventsToProcess)
 {
 #if wxUSE_THREADS
@@ -221,34 +239,34 @@ bool wxCFEventLoop::YieldFor(long eventsToProcess)
         return true;
     }
 #endif // wxUSE_THREADS
-    
+
     m_isInsideYield = true;
     m_eventsToProcessInsideYield = eventsToProcess;
-    
+
 #if wxUSE_LOG
     // disable log flushing from here because a call to wxYield() shouldn't
     // normally result in message boxes popping up &c
     wxLog::Suspend();
 #endif // wxUSE_LOG
-    
+
     // process all pending events:
     while ( DoProcessEvents() == 1 )
         ;
-    
+
     // it's necessary to call ProcessIdle() to update the frames sizes which
     // might have been changed (it also will update other things set from
     // OnUpdateUI() which is a nice (and desired) side effect)
     while ( ProcessIdle() ) {}
-    
+
     // if there are pending events, we must process them.
     if (wxTheApp)
         wxTheApp->ProcessPendingEvents();
-    
+
 #if wxUSE_LOG
     wxLog::Resume();
 #endif // wxUSE_LOG
     m_isInsideYield = false;
-    
+
     return true;
 }
 
@@ -260,7 +278,7 @@ bool wxCFEventLoop::Pending() const
 
 int wxCFEventLoop::DoProcessEvents()
 {
-    return DispatchTimeout( 1000 );
+    return DispatchTimeout( 0 );
 }
 
 bool wxCFEventLoop::Dispatch()
@@ -274,7 +292,7 @@ int wxCFEventLoop::DispatchTimeout(unsigned long timeout)
         return 0;
 
     int status = DoDispatchTimeout(timeout);
-    
+
     switch( status )
     {
         case 0:
@@ -282,17 +300,17 @@ int wxCFEventLoop::DispatchTimeout(unsigned long timeout)
         case -1:
             if ( m_shouldExit )
                 return 0;
-            
+
             break;
         case 1:
             break;
     }
-    
+
     return status;
 }
 
 int wxCFEventLoop::DoDispatchTimeout(unsigned long timeout)
-{    
+{
     SInt32 status = CFRunLoopRunInMode(kCFRunLoopDefaultMode, timeout / 1000.0 , true);
     switch( status )
     {
@@ -319,7 +337,7 @@ void wxCFEventLoop::DoRun()
         // generate and process idle events for as long as we don't
         // have anything else to do
         DoProcessEvents();
-        
+
         // if the "should exit" flag is set, the loop should terminate
         // but not before processing any remaining messages so while
         // Pending() returns true, do process them
@@ -327,7 +345,7 @@ void wxCFEventLoop::DoRun()
         {
             while ( DoProcessEvents() == 1 )
                 ;
-            
+
             break;
         }
     }
@@ -344,12 +362,12 @@ int wxCFEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, wxT("can't reenter a message loop") );
-    
+
     // ProcessIdle() and ProcessEvents() below may throw so the code here should
     // be exception-safe, hence we must use local objects for all actions we
     // should undo
     wxEventLoopActivator activate(this);
-    
+
     // we must ensure that OnExit() is called even if an exception is thrown
     // from inside ProcessEvents() but we must call it from Exit() in normal
     // situations because it is supposed to be called synchronously,
@@ -361,9 +379,9 @@ int wxCFEventLoop::Run()
         try
         {
 #endif // wxUSE_EXCEPTIONS
-            
+
             DoRun();
-            
+
 #if wxUSE_EXCEPTIONS
             // exit the outer loop as well
             break;
@@ -390,7 +408,7 @@ int wxCFEventLoop::Run()
         }
     }
 #endif // wxUSE_EXCEPTIONS
-    
+
     return m_exitcode;
 }
 
@@ -402,27 +420,3 @@ void wxCFEventLoop::Exit(int rc)
     m_shouldExit = true;
     DoStop();
 }
-
-#if wxUSE_GUI
-
-wxModalEventLoop::wxModalEventLoop(wxWindow *winModal)
-{
-    m_modalWindow = dynamic_cast<wxNonOwnedWindow*> (winModal);
-    wxASSERT_MSG( m_modalWindow != NULL, "must pass in a toplevel window for modal event loop" );
-}
-
-#ifdef __WXOSX_IPHONE__
-
-void wxModalEventLoop::DoRun()
-{
-    // presentModalViewController:animated:
-}
-
-void wxModalEventLoop::DoStop()
-{
-    // (void)dismissModalViewControllerAnimated:(BOOL)animated
-}
-
-#endif // wxUSE_GUI
-
-#endif