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

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

View File

@@ -17,8 +17,11 @@
DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoop ); DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoop );
DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopObserver ); DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopObserver );
class WXDLLIMPEXP_BASE wxCFEventLoopPauseObservers;
class WXDLLIMPEXP_BASE wxCFEventLoop : public wxEventLoopBase class WXDLLIMPEXP_BASE wxCFEventLoop : public wxEventLoopBase
{ {
friend class wxCFEventLoopPauseObservers;
public: public:
wxCFEventLoop(); wxCFEventLoop();
virtual ~wxCFEventLoop(); virtual ~wxCFEventLoop();
@@ -53,11 +56,13 @@ public:
AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags); AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags);
#endif // wxUSE_EVENTLOOP_SOURCE #endif // wxUSE_EVENTLOOP_SOURCE
protected: protected:
void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity); void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity); void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
// set to false to avoid idling at unexpected moments - eg when having native message boxes
void SetProcessIdleEvents(bool process) { m_processIdleEvents = process; }
static void OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info); static void OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info);
static void OSXDefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info); static void OSXDefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info);
@@ -84,6 +89,9 @@ protected:
// default mode runloop observer // default mode runloop observer
CFRunLoopObserverRef m_defaultModeRunLoopObserver; CFRunLoopObserverRef m_defaultModeRunLoopObserver;
// set to false to avoid idling at unexpected moments - eg when having native message boxes
bool m_processIdleEvents;
private: private:
// process all already pending events and dispatch a new one (blocking // process all already pending events and dispatch a new one (blocking
@@ -91,6 +99,15 @@ private:
// //
// returns the return value of DoDispatchTimeout() // returns the return value of DoDispatchTimeout()
int DoProcessEvents(); int DoProcessEvents();
wxDECLARE_NO_COPY_CLASS(wxCFEventLoop);
};
class WXDLLIMPEXP_BASE wxCFEventLoopPauseObservers : public wxObject
{
public:
wxCFEventLoopPauseObservers();
virtual ~wxCFEventLoopPauseObservers();
}; };
#if wxUSE_GUI #if wxUSE_GUI

View File

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