guarding open combo box against AppDefined NSEvents issued by wxEventLoop::WakeUp...

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

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index ac4bfd2e4a5eafdd74f9c7353ac6b3969ebccbad..030b1e6a23ca794f20300296232329ce0a8219c6 100644 (file)
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -145,6 +145,8 @@ bool shouldHandleSelector(SEL selector)
 // wx native implementation 
 //
 
+static NSResponder* s_nextFirstResponder = NULL;
+
 @interface wxNSWindow : NSWindow
 {
 }
@@ -152,6 +154,7 @@ bool shouldHandleSelector(SEL selector)
 - (void) sendEvent:(NSEvent *)event;
 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen;
 - (void)noResponderFor: (SEL) selector;
+- (BOOL)makeFirstResponder:(NSResponder *)aResponder;
 @end
 
 @implementation wxNSWindow
@@ -206,6 +209,14 @@ bool shouldHandleSelector(SEL selector)
     return YES;
 }
 
+- (BOOL)makeFirstResponder:(NSResponder *)aResponder
+{
+    s_nextFirstResponder = aResponder;
+    BOOL retval = [super makeFirstResponder:aResponder];
+    s_nextFirstResponder = nil;
+    return retval;
+}
+
 @end
 
 @interface wxNSPanel : NSPanel
@@ -215,6 +226,7 @@ bool shouldHandleSelector(SEL selector)
 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen;
 - (void)noResponderFor: (SEL) selector;
 - (void)sendEvent:(NSEvent *)event;
+- (BOOL)makeFirstResponder:(NSResponder *)aResponder;
 @end
 
 @implementation wxNSPanel
@@ -265,6 +277,14 @@ bool shouldHandleSelector(SEL selector)
     }
 }
 
+- (BOOL)makeFirstResponder:(NSResponder *)aResponder
+{
+    s_nextFirstResponder = aResponder;
+    BOOL retval = [super makeFirstResponder:aResponder];
+    s_nextFirstResponder = nil;
+    return retval;
+}
+
 @end
 
 
@@ -568,12 +588,12 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
 
     if ( style & wxFRAME_TOOL_WINDOW || ( style & wxPOPUP_WINDOW ) ||
             GetWXPeer()->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG )
-    {
         m_macWindow = [wxNSPanel alloc];
-    }
     else
         m_macWindow = [wxNSWindow alloc];
 
+    [m_macWindow setAcceptsMouseMovedEvents:YES];
+
     CGWindowLevel level = kCGNormalWindowLevel;
 
     if ( style & wxFRAME_TOOL_WINDOW )
@@ -1041,6 +1061,12 @@ void wxNonOwnedWindowCocoaImpl::RestoreWindowLevel()
         [m_macWindow setLevel:m_macWindowLevel];
 }
 
+WX_NSResponder wxNonOwnedWindowCocoaImpl::GetNextFirstResponder()
+{
+    return s_nextFirstResponder;
+}
+
+
 //
 //
 //