projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding magnification API into the wxWindow classes for best retina support
[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 8d3ef5f84389c5ee284ada073078c74cbc7d1597..9eefc0d22bf1da8d19c9f59401f93924ed930b0b 100644
(file)
--- a/
src/osx/core/evtloop_cf.cpp
+++ b/
src/osx/core/evtloop_cf.cpp
@@
-203,6
+203,10
@@
wxCFEventLoop::wxCFEventLoop()
m_shouldExit = false;
m_processIdleEvents = true;
m_shouldExit = false;
m_processIdleEvents = true;
+#if wxUSE_UIACTIONSIMULATOR
+ m_shouldWaitForEvent = false;
+#endif
+
m_runLoop = CFGetCurrentRunLoop();
CFRunLoopObserverContext ctxt;
m_runLoop = CFGetCurrentRunLoop();
CFRunLoopObserverContext ctxt;
@@
-298,7
+302,15
@@
bool wxCFEventLoop::Pending() const
int wxCFEventLoop::DoProcessEvents()
{
int wxCFEventLoop::DoProcessEvents()
{
- return DispatchTimeout( 0 );
+ if ( m_shouldWaitForEvent )
+ {
+ int handled = DispatchTimeout( 1000 );
+ wxASSERT_MSG( handled == 1, "No Event Available");
+ m_shouldWaitForEvent = false;
+ return handled;
+ }
+ else
+ return DispatchTimeout( 0 );
}
bool wxCFEventLoop::Dispatch()
}
bool wxCFEventLoop::Dispatch()