From 58e74b83b18eb58f6208b8fc08dad016646081d9 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 19 May 2010 08:25:48 +0000 Subject: [PATCH] common wxMacWakeUp code across all platforms git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/core/evtloop_cf.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp index 3b85b35085..ad9a5da15e 100644 --- a/src/osx/core/evtloop_cf.cpp +++ b/src/osx/core/evtloop_cf.cpp @@ -146,7 +146,7 @@ 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(info); if ( eventloop ) @@ -196,8 +196,9 @@ wxCFEventLoop::wxCFEventLoop() bzero( &ctxt, sizeof(ctxt) ); ctxt.info = this; m_runLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0, - wxObserverCallBack, &ctxt ); + wxObserverCallBack, &ctxt ); CFRunLoopAddObserver(m_runLoop, m_runLoopObserver, kCFRunLoopCommonModes); + CFRelease(m_runLoopObserver); } wxCFEventLoop::~wxCFEventLoop() @@ -213,9 +214,7 @@ CFRunLoopRef wxCFEventLoop::CFGetCurrentRunLoop() const void wxCFEventLoop::WakeUp() { - extern void wxMacWakeUp(); - - wxMacWakeUp(); + CFRunLoopWakeUp(m_runLoop); } bool wxCFEventLoop::YieldFor(long eventsToProcess) -- 2.45.2