From 4b0a48dbaccd431201c099f4c63a800251884c40 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 2 May 2012 19:30:11 +0000 Subject: [PATCH] make WakeUp variant explicit, too many errors using heuristics, like #14176 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/cocoa/evtloop.h | 5 +++++ src/osx/cocoa/evtloop.mm | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/wx/osx/cocoa/evtloop.h b/include/wx/osx/cocoa/evtloop.h index a327ee45de..8ccf5b22ba 100644 --- a/include/wx/osx/cocoa/evtloop.h +++ b/include/wx/osx/cocoa/evtloop.h @@ -23,6 +23,9 @@ public: virtual void WakeUp(); + void OSXUseLowLevelWakeup(bool useIt) + { m_osxLowLevelWakeUp = useIt ; } + protected: virtual int DoDispatchTimeout(unsigned long timeout); @@ -39,6 +42,8 @@ protected: WXWindow m_dummyWindow; int m_modalNestedLevel; + + bool m_osxLowLevelWakeUp; }; #endif // _WX_OSX_COCOA_EVTLOOP_H_ diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm index 27e33bca25..135f936de5 100644 --- a/src/osx/cocoa/evtloop.mm +++ b/src/osx/cocoa/evtloop.mm @@ -109,6 +109,7 @@ wxGUIEventLoop::wxGUIEventLoop() m_dummyWindow = nil; m_modalNestedLevel = 0; m_modalWindow = NULL; + m_osxLowLevelWakeUp = false; } wxGUIEventLoop::~wxGUIEventLoop() @@ -256,11 +257,11 @@ void wxGUIEventLoop::DoStop() void wxGUIEventLoop::WakeUp() { // NSEvent* cevent = [NSApp currentEvent]; - NSString* mode = [[NSRunLoop mainRunLoop] currentMode]; + // NSString* mode = [[NSRunLoop mainRunLoop] currentMode]; // when already in a mouse event handler, don't add higher level event // if ( cevent != nil && [cevent type] <= NSMouseMoved && ) - if ( [NSEventTrackingRunLoopMode isEqualToString:mode] ) + if ( m_osxLowLevelWakeUp /* [NSEventTrackingRunLoopMode isEqualToString:mode] */ ) { // NSLog(@"event for wakeup %@ in mode %@",cevent,mode); wxCFEventLoop::WakeUp(); -- 2.45.2