Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

offer suppression of idle processing (delayed destruction happened too early eg when showing native message boxes)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-06-15 00:03:51 +00:00
parent 9ef3f6f2c9
commit 4c4cbded1f
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/osx/core/evtloop_cf.cpp
View File

@@ -169,7 +169,7 @@ void wxCFEventLoop::CommonModeObserverCallBack(CFRunLoopObserverRef WXUNUSED(obs
if ( activity & kCFRunLoopBeforeWaiting )
{
if ( ProcessIdle() )
if ( m_processIdleEvents && ProcessIdle() )
{
WakeUp();
}
@@ -201,6 +201,7 @@ wxCFEventLoop::DefaultModeObserverCallBack(CFRunLoopObserverRef WXUNUSED(observe
wxCFEventLoop::wxCFEventLoop()
{
m_shouldExit = false;
m_processIdleEvents = true;
m_runLoop = CFGetCurrentRunLoop();
@@ -210,18 +211,19 @@ wxCFEventLoop::wxCFEventLoop()
m_commonModeRunLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0,
(CFRunLoopObserverCallBack) wxCFEventLoop::OSXCommonModeObserverCallBack, &ctxt );
CFRunLoopAddObserver(m_runLoop, m_commonModeRunLoopObserver, kCFRunLoopCommonModes);
CFRelease(m_commonModeRunLoopObserver);
m_defaultModeRunLoopObserver = CFRunLoopObserverCreate( kCFAllocatorDefault, kCFRunLoopBeforeTimers | kCFRunLoopBeforeWaiting , true /* repeats */, 0,
(CFRunLoopObserverCallBack) wxCFEventLoop::OSXDefaultModeObserverCallBack, &ctxt );
CFRunLoopAddObserver(m_runLoop, m_defaultModeRunLoopObserver, kCFRunLoopDefaultMode);
CFRelease(m_defaultModeRunLoopObserver);
}
wxCFEventLoop::~wxCFEventLoop()
{
CFRunLoopRemoveObserver(m_runLoop, m_commonModeRunLoopObserver, kCFRunLoopCommonModes);
CFRunLoopRemoveObserver(m_runLoop, m_defaultModeRunLoopObserver, kCFRunLoopDefaultMode);
CFRelease(m_defaultModeRunLoopObserver);
CFRelease(m_commonModeRunLoopObserver);
}
@@ -439,6 +441,20 @@ void wxCFEventLoop::Exit(int rc)
DoStop();
}
wxCFEventLoopPauseObservers::wxCFEventLoopPauseObservers()
{
wxCFEventLoop* cfl = dynamic_cast<wxCFEventLoop*>(wxEventLoopBase::GetActive());
if ( cfl )
cfl->SetProcessIdleEvents(false);
}
wxCFEventLoopPauseObservers::~wxCFEventLoopPauseObservers()
{
wxCFEventLoop* cfl = dynamic_cast<wxCFEventLoop*>(wxEventLoopBase::GetActive());
if ( cfl )
cfl->SetProcessIdleEvents(true);
}
// TODO Move to thread_osx.cpp
#if wxUSE_THREADS