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 1d5475532bd47716cfe042f655ed15d88f426271..030b1e6a23ca794f20300296232329ce0a8219c6 100644 (file)
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -111,7 +111,7 @@ bool shouldHandleSelector(SEL selector)
     return (wxNonOwnedWindowCocoaImpl*) wxNonOwnedWindowImpl::FindFromWXWindow( self );
 }
 
     return (wxNonOwnedWindowCocoaImpl*) wxNonOwnedWindowImpl::FindFromWXWindow( self );
 }
 

-// TODO in cocoa everything during a drag is sent to the NSWindow the mouse down occured, 
+// TODO in cocoa everything during a drag is sent to the NSWindow the mouse down occurred,

 // this does not conform to the wx behaviour if the window is not captured, so try to resend
 // or capture all wx mouse event handling at the tlw as we did for carbon
 
 // this does not conform to the wx behaviour if the window is not captured, so try to resend
 // or capture all wx mouse event handling at the tlw as we did for carbon
 


@@ -145,6 +145,8 @@ bool shouldHandleSelector(SEL selector)
 // wx native implementation 
 //
 
 // wx native implementation 
 //
 

+static NSResponder* s_nextFirstResponder = NULL;
+

 @interface wxNSWindow : NSWindow
 {
 }
 @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;
 - (void) sendEvent:(NSEvent *)event;
 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen;
 - (void)noResponderFor: (SEL) selector;

+- (BOOL)makeFirstResponder:(NSResponder *)aResponder;

 @end
 
 @implementation wxNSWindow
 @end
 
 @implementation wxNSWindow


@@ -206,6 +209,14 @@ bool shouldHandleSelector(SEL selector)
     return YES;
 }
 
     return YES;
 }
 

+- (BOOL)makeFirstResponder:(NSResponder *)aResponder
+{
+    s_nextFirstResponder = aResponder;
+    BOOL retval = [super makeFirstResponder:aResponder];
+    s_nextFirstResponder = nil;
+    return retval;
+}
+

 @end
 
 @interface wxNSPanel : NSPanel
 @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;
 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen;
 - (void)noResponderFor: (SEL) selector;
 - (void)sendEvent:(NSEvent *)event;

+- (BOOL)makeFirstResponder:(NSResponder *)aResponder;

 @end
 
 @implementation wxNSPanel
 @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
 
 
 @end
 
 


@@ -450,12 +470,19 @@ extern int wxOSXGetIdFromSelector(SEL action );
         if ( wxpeer )
         {
             wxpeer->HandleActivated(0, false);
         if ( wxpeer )
         {
             wxpeer->HandleActivated(0, false);

+            // as for wx the deactivation also means losing focus we
+            // must trigger this manually
+            [window makeFirstResponder:nil];
+            
+            // TODO Remove if no problems arise with Popup Windows
+#if 0

             // Needed for popup window since the firstResponder
             // (focus in wx) doesn't change when this
             // TLW becomes inactive.
             wxFocusEvent event( wxEVT_KILL_FOCUS, wxpeer->GetId());
             event.SetEventObject(wxpeer);
             wxpeer->HandleWindowEvent(event);
             // Needed for popup window since the firstResponder
             // (focus in wx) doesn't change when this
             // TLW becomes inactive.
             wxFocusEvent event( wxEVT_KILL_FOCUS, wxpeer->GetId());
             event.SetEventObject(wxpeer);
             wxpeer->HandleWindowEvent(event);

+#endif

         }
     }
 }
         }
     }
 }


@@ -477,6 +504,19 @@ extern int wxOSXGetIdFromSelector(SEL action );
         }
         return editor;
     } 
         }
         return editor;
     } 

+    else if ([anObject isKindOfClass:[wxNSComboBox class]])
+    {
+        wxNSComboBox * cb = (wxNSComboBox*) anObject;
+        wxNSTextFieldEditor* editor = [cb fieldEditor];
+        if ( editor == nil )
+        {
+            editor = [[wxNSTextFieldEditor alloc] init];
+            [editor setFieldEditor:YES];
+            [cb setFieldEditor:editor];
+            [editor release];
+        }
+        return editor;
+    }    

  
     return nil;
 }
  
     return nil;
 }


@@ -548,12 +588,12 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
 
     if ( style & wxFRAME_TOOL_WINDOW || ( style & wxPOPUP_WINDOW ) ||
             GetWXPeer()->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG )
 
     if ( style & wxFRAME_TOOL_WINDOW || ( style & wxPOPUP_WINDOW ) ||
             GetWXPeer()->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG )

-    {

         m_macWindow = [wxNSPanel alloc];
         m_macWindow = [wxNSPanel alloc];

-    }

     else
         m_macWindow = [wxNSWindow alloc];
 
     else
         m_macWindow = [wxNSWindow alloc];
 

+    [m_macWindow setAcceptsMouseMovedEvents:YES];
+

     CGWindowLevel level = kCGNormalWindowLevel;
 
     if ( style & wxFRAME_TOOL_WINDOW )
     CGWindowLevel level = kCGNormalWindowLevel;
 
     if ( style & wxFRAME_TOOL_WINDOW )


@@ -688,7 +728,8 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
         if ( wxpeer )
         {
             // add to parent window before showing
         if ( wxpeer )
         {
             // add to parent window before showing

-            if ( wxpeer->GetParent() )
+            wxDialog * const dialog = wxDynamicCast(wxpeer, wxDialog);
+            if ( wxpeer->GetParent() && dialog && dialog->IsModal())

             {
                 NSView * parentView = wxpeer->GetParent()->GetPeer()->GetWXWidget();
                 if ( parentView )
             {
                 NSView * parentView = wxpeer->GetParent()->GetPeer()->GetWXWidget();
                 if ( parentView )


@@ -763,7 +804,8 @@ void wxNonOwnedWindowCocoaImpl::SetExtraStyle( long exStyle )
 
 void wxNonOwnedWindowCocoaImpl::SetWindowStyleFlag( long style )
 {
 
 void wxNonOwnedWindowCocoaImpl::SetWindowStyleFlag( long style )
 {

-    if (m_macWindow)
+    // don't mess with native wrapped windows, they might throw an exception when their level is changed
+    if (!m_wxPeer->IsNativeWindowWrapper() && m_macWindow)

     {
         CGWindowLevel level = kCGNormalWindowLevel;
         
     {
         CGWindowLevel level = kCGNormalWindowLevel;
         


@@ -1019,6 +1061,12 @@ void wxNonOwnedWindowCocoaImpl::RestoreWindowLevel()
         [m_macWindow setLevel:m_macWindowLevel];
 }
 
         [m_macWindow setLevel:m_macWindowLevel];
 }
 

+WX_NSResponder wxNonOwnedWindowCocoaImpl::GetNextFirstResponder()
+{
+    return s_nextFirstResponder;
+}
+
+

 //
 //
 //
 //
 //
 //