Use the correct window as parent of wxInfoBar close button.

[wxWidgets.git] / src / osx / cocoa / evtloop.mm

diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm
index 74ecc9d54f651659c3959e9c00526e042b46735a..135f936de528e28f269bde091b4aecbbfeeb0846 100644 (file)
--- 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();        
@@ -459,5 +460,4 @@ wxWindowDisabler::~wxWindowDisabler()
     }
     
     delete m_winDisabled;
-}
-
+}
\ No newline at end of file