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

better support for ui action simulation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2013-06-11 17:54:07 +00:00
parent 31f125ed00
commit d60957aac5
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/osx/core/evtloop.h
View File

@@ -55,6 +55,13 @@ public:
#endif // wxUSE_EVENTLOOP_SOURCE #endif // wxUSE_EVENTLOOP_SOURCE
bool ShouldProcessIdleEvents() const { return m_processIdleEvents ; } bool ShouldProcessIdleEvents() const { return m_processIdleEvents ; }
#if wxUSE_UIACTIONSIMULATOR
// notifies Yield and Dispatch to wait for at least one event before
// returning, this is necessary, because the synthesized events need to be
// converted by the OS before being available on the native event queue
void SetShouldWaitForEvent(bool should) { m_shouldWaitForEvent = should; }
#endif
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);
@@ -92,6 +99,9 @@ protected:
// set to false to avoid idling at unexpected moments - eg when having native message boxes // set to false to avoid idling at unexpected moments - eg when having native message boxes
bool m_processIdleEvents; bool m_processIdleEvents;
#if wxUSE_UIACTIONSIMULATOR
bool m_shouldWaitForEvent;
#endif
private: private:
// process all already pending events and dispatch a new one (blocking // process all already pending events and dispatch a new one (blocking
// until it appears in the event queue if necessary) // until it appears in the event queue if necessary)

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

@@ -203,6 +203,10 @@ wxCFEventLoop::wxCFEventLoop()
m_shouldExit = false; m_shouldExit = false;
m_processIdleEvents = true; m_processIdleEvents = true;
#if wxUSE_UIACTIONSIMULATOR
m_shouldWaitForEvent = false;
#endif
m_runLoop = CFGetCurrentRunLoop(); m_runLoop = CFGetCurrentRunLoop();
CFRunLoopObserverContext ctxt; CFRunLoopObserverContext ctxt;
@@ -298,6 +302,12 @@ bool wxCFEventLoop::Pending() const
int wxCFEventLoop::DoProcessEvents() int wxCFEventLoop::DoProcessEvents()
{ {
if ( m_shouldWaitForEvent )
{
int handled = DispatchTimeout( 10000 );
wxASSERT_MSG( handled == 1, "No Event Available");
m_shouldWaitForEvent = false;
}
return DispatchTimeout( 0 ); return DispatchTimeout( 0 );
} }