X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/968978c0e4e9b4c59cfa6ff811610efdb720c068..0afeb753e0a6a3fdba290bf3612bb2f012d44d95:/src/osx/cocoa/nonownedwnd.mm

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index 81ecf321aa..030b1e6a23 100644
--- 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 );
 }
 
-// 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
 
@@ -131,22 +131,6 @@ bool shouldHandleSelector(SEL selector)
             ((wxWidgetCocoaImpl*)cw->GetPeer())->DoHandleMouseEvent( event);
             handled = true;
         }
-        else if ( [event type] == NSMouseMoved )
-        {
-            NSPoint nsPoint = [event locationInWindow];
-            if ( [event window] != nil )
-                nsPoint = [[event window] convertBaseToScreen:nsPoint];
-
-            wxPoint pt = wxFromNSPoint(NULL, nsPoint);
-            wxWindow* mw = ::wxFindWindowAtPoint(pt);
-            if ( mw )
-            {
-                if (wxTheApp)
-                    wxTheApp->MacSetCurrentEvent(event, NULL);
-                ((wxWidgetCocoaImpl*)mw->GetPeer())->DoHandleMouseEvent( event);
-                handled = true;
-            }
-        }
         if ( handled )
         {
             if (wxTheApp)
@@ -161,6 +145,8 @@ bool shouldHandleSelector(SEL selector)
 // wx native implementation 
 //
 
+static NSResponder* s_nextFirstResponder = NULL;
+
 @interface wxNSWindow : NSWindow
 {
 }
@@ -168,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
@@ -222,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
@@ -231,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
@@ -281,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
 
 
@@ -466,12 +470,19 @@ extern int wxOSXGetIdFromSelector(SEL action );
         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);
+#endif
         }
     }
 }
@@ -493,6 +504,19 @@ extern int wxOSXGetIdFromSelector(SEL action );
         }
         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;
 }
@@ -533,6 +557,12 @@ wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
     if ( !m_wxPeer->IsNativeWindowWrapper() )
     {
         [m_macWindow setDelegate:nil];
+     
+        // make sure we remove this first, otherwise the ref count will not lead to the 
+        // native window's destruction
+        if ([m_macWindow parentWindow] != 0)
+            [[m_macWindow parentWindow] removeChildWindow: m_macWindow];
+
         [m_macWindow release];
     }
 }
@@ -558,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 )
@@ -654,8 +684,6 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
 
     [m_macWindow setDelegate:controller];
 
-    [m_macWindow setAcceptsMouseMovedEvents: YES];
-    
     if ( ( style & wxFRAME_SHAPED) )
     {
         [m_macWindow setOpaque:NO];
@@ -697,14 +725,35 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
     if ( show )
     {
         wxNonOwnedWindow* wxpeer = GetWXPeer(); 
-        if (wxpeer && !(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW)) 
-            [m_macWindow makeKeyAndOrderFront:nil];
-        else 
-            [m_macWindow orderFront:nil]; 
+        if ( wxpeer )
+        {
+            // add to parent window before showing
+            wxDialog * const dialog = wxDynamicCast(wxpeer, wxDialog);
+            if ( wxpeer->GetParent() && dialog && dialog->IsModal())
+            {
+                NSView * parentView = wxpeer->GetParent()->GetPeer()->GetWXWidget();
+                if ( parentView )
+                {
+                    NSWindow* parentNSWindow = [parentView window];
+                    if ( parentNSWindow )
+                        [parentNSWindow addChildWindow:m_macWindow ordered:NSWindowAbove];
+                }
+            }
+            
+            if (!(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW)) 
+                [m_macWindow makeKeyAndOrderFront:nil];
+            else 
+                [m_macWindow orderFront:nil]; 
+        }
         [[m_macWindow contentView] setNeedsDisplay: YES];
     }
     else
+    {
+        // avoid propagation of orderOut to parent 
+        if ([m_macWindow parentWindow] != 0)
+            [[m_macWindow parentWindow] removeChildWindow: m_macWindow];
         [m_macWindow orderOut:nil];
+    }
     return true;
 }
 
@@ -755,7 +804,8 @@ void wxNonOwnedWindowCocoaImpl::SetExtraStyle( long exStyle )
 
 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;
         
@@ -1011,6 +1061,12 @@ void wxNonOwnedWindowCocoaImpl::RestoreWindowLevel()
         [m_macWindow setLevel:m_macWindowLevel];
 }
 
+WX_NSResponder wxNonOwnedWindowCocoaImpl::GetNextFirstResponder()
+{
+    return s_nextFirstResponder;
+}
+
+
 //
 //
 //