X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bb839504eb6535694251487cc9025df8c3c7f426..36a6cfd2fb7a49e5e350ef512b9b218b05957028:/src/osx/cocoa/nonownedwnd.mm

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index d6857babc4..c37765cd5c 100644
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -23,18 +23,18 @@ NSRect wxToNSRect( NSView* parent, const wxRect& r )
     int y = r.y;
     int x = r.x ;
     if ( parent == NULL || ![ parent isFlipped ] )
-        y = frame.size.height - ( r.y + r.height );
+        y = (int)(frame.size.height - ( r.y + r.height ));
     return NSMakeRect(x, y, r.width , r.height);
 }
 
 wxRect wxFromNSRect( NSView* parent, const NSRect& rect )
 {
     NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
-    int y = rect.origin.y;
-    int x = rect.origin.x;
+    int y = (int)rect.origin.y;
+    int x = (int)rect.origin.x;
     if ( parent == NULL || ![ parent isFlipped ] )
-        y = frame.size.height - (rect.origin.y + rect.size.height);
-    return wxRect( x, y, rect.size.width, rect.size.height );
+        y = (int)(frame.size.height - (rect.origin.y + rect.size.height));
+    return wxRect( x, y, (int)rect.size.width, (int)rect.size.height );
 }
 
 NSPoint wxToNSPoint( NSView* parent, const wxPoint& p )
@@ -43,33 +43,54 @@ NSPoint wxToNSPoint( NSView* parent, const wxPoint& p )
     int x = p.x ;
     int y = p.y;
     if ( parent == NULL || ![ parent isFlipped ] )
-        y = frame.size.height - ( p.y );
+        y = (int)(frame.size.height - ( p.y ));
     return NSMakePoint(x, y);
 }
 
 wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
 {
     NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
-    int x = p.x;
-    int y = p.y;
+    int x = (int)p.x;
+    int y = (int)p.y;
     if ( parent == NULL || ![ parent isFlipped ] )
-        y = frame.size.height - ( p.y );
+        y = (int)(frame.size.height - ( p.y ));
     return wxPoint( x, y);
 }
 
+bool shouldHandleSelector(SEL selector)
+{
+    if (selector == @selector(noop:) 
+            || selector == @selector(complete:)
+            || selector == @selector(deleteBackward:)
+            || selector == @selector(deleteForward:)
+            || selector == @selector(insertNewline:)
+            || selector == @selector(insertTab:)
+            || selector == @selector(keyDown:)
+            || selector == @selector(keyUp:)
+            || selector == @selector(scrollPageUp:)
+            || selector == @selector(scrollPageDown:)
+            || selector == @selector(scrollToBeginningOfDocument:)
+            || selector == @selector(scrollToEndOfDocument:))
+        return false;
+        
+    return true;
+
+}
+
 //
 // wx native implementation classes
 //
 
-@interface wxNSWindow : NSWindow
+typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector);
 
+@interface wxNSWindow : NSWindow
 {
     wxNonOwnedWindowCocoaImpl* impl;
 }
 
 - (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation;
 - (wxNonOwnedWindowCocoaImpl*) implementation;
-
+- (void)noResponderFor: (SEL) selector;
 @end
 
 @implementation wxNSWindow
@@ -84,6 +105,24 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
     return impl;
 }
 
+- (void)doCommandBySelector:(SEL)selector
+{
+    if (shouldHandleSelector(selector) && 
+        !(selector == @selector(cancel:) || selector == @selector(cancelOperation:)) )
+        [super doCommandBySelector:selector];
+}
+
+
+// NB: if we don't do this, all key downs that get handled lead to a NSBeep
+- (void)noResponderFor: (SEL) selector
+{
+    if (selector != @selector(keyDown:) && selector != @selector(keyUp:))
+    {
+        [super noResponderFor:selector];
+//        wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)];
+//        superimpl(self, @selector(noResponderFor:), selector);
+    }
+}
 
 @end
 
@@ -95,7 +134,7 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
 
 - (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation;
 - (wxNonOwnedWindowCocoaImpl*) implementation;
-
+- (void)noResponderFor: (SEL) selector;
 @end
 
 @implementation wxNSPanel 
@@ -105,11 +144,33 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
     impl = theImplementation;
 }
 
+- (BOOL)canBecomeKeyWindow
+{
+    return YES;
+}
+
 - (wxNonOwnedWindowCocoaImpl*) implementation
 {
     return impl;
 }
 
+- (void)doCommandBySelector:(SEL)selector
+{
+    if (shouldHandleSelector(selector))
+        [super doCommandBySelector:selector];
+}
+
+// NB: if we don't do this, it seems that all events that end here lead to a NSBeep
+- (void)noResponderFor: (SEL) selector
+{
+    if (selector != @selector(keyDown:) && selector != @selector(keyUp:))
+    {
+        [super noResponderFor:selector];
+//        wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)];
+//        superimpl(self, @selector(noResponderFor:), selector);
+    }
+}
+
 @end
 
 
@@ -123,8 +184,8 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
 
 - (void)windowDidResize:(NSNotification *)notification;
 - (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize;
-- (void)windowDidResignMain:(NSNotification *)notification;
-- (void)windowDidBecomeMain:(NSNotification *)notification;
+- (void)windowDidResignKey:(NSNotification *)notification;
+- (void)windowDidBecomeKey:(NSNotification *)notification;
 - (void)windowDidMove:(NSNotification *)notification;
 - (BOOL)windowShouldClose:(id)window;
 
@@ -156,8 +217,8 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
 {
     NSRect frame = [win frame];
     wxRect wxframe = wxFromNSRect( NULL, frame );
-    wxframe.SetWidth( proposedFrameSize.width );
-    wxframe.SetHeight( proposedFrameSize.height );
+    wxframe.SetWidth( (int)proposedFrameSize.width );
+    wxframe.SetHeight( (int)proposedFrameSize.height );
     wxNSWindow* window = (wxNSWindow*) win;
     wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
     if ( windowimpl )
@@ -198,7 +259,7 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
     }
 }
 
-- (void)windowDidBecomeMain:(NSNotification *)notification
+- (void)windowDidBecomeKey:(NSNotification *)notification
 {
     wxNSWindow* window = (wxNSWindow*) [notification object];
     wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
@@ -210,7 +271,7 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
     }
 }
 
-- (void)windowDidResignMain:(NSNotification *)notification
+- (void)windowDidResignKey:(NSNotification *)notification
 {
     wxNSWindow* window = (wxNSWindow*) [notification object];
     wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
@@ -218,8 +279,36 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
     {
         wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
         if ( wxpeer )
+        {
             wxpeer->HandleActivated(0, false);
+            // 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);
+        }
+    }
+}
+
+- (id)windowWillReturnFieldEditor:(NSWindow *)sender toObject:(id)anObject
+{
+    wxUnusedVar(sender);
+
+    if ([anObject isKindOfClass:[wxNSTextField class]])
+    {
+        wxNSTextField* tf = (wxNSTextField*) anObject;
+        wxNSTextFieldEditor* editor = [tf fieldEditor];
+        if ( editor == nil )
+        {
+            editor = [[wxNSTextFieldEditor alloc] init];
+            [editor setFieldEditor:YES];
+            [tf setFieldEditor:editor];
+        }
+        return editor;
     }
+
+    return nil;
 }
 
 @end
@@ -251,8 +340,8 @@ void wxNonOwnedWindowCocoaImpl::Destroy()
     wxPendingDelete.Append( new wxDeferredObjectDeleter( this ) );
 }
 
-void wxNonOwnedWindowCocoaImpl::Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
-long style, long extraStyle, const wxString& name )
+void wxNonOwnedWindowCocoaImpl::Create( wxWindow* WXUNUSED(parent), const wxPoint& pos, const wxSize& size,
+long style, long extraStyle, const wxString& WXUNUSED(name) )
 {
     static wxNonOwnedWindowController* controller = NULL;
     
@@ -262,8 +351,11 @@ long style, long extraStyle, const wxString& name )
 
     int windowstyle = NSBorderlessWindowMask;
     
-    if ( style & wxFRAME_TOOL_WINDOW )
+    if ( style & wxFRAME_TOOL_WINDOW || ( style & wxPOPUP_WINDOW ) || 
+            GetWXPeer()->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG )
+    {
         m_macWindow = [wxNSPanel alloc];
+    }
     else
         m_macWindow = [wxNSWindow alloc];
     
@@ -271,7 +363,12 @@ long style, long extraStyle, const wxString& name )
     
     if ( style & wxFRAME_TOOL_WINDOW )
     {
-        windowstyle |= NSTitledWindowMask | NSUtilityWindowMask;
+        windowstyle |= NSUtilityWindowMask;
+        if ( ( style & wxMINIMIZE_BOX ) || ( style & wxMAXIMIZE_BOX ) ||
+            ( style & wxCLOSE_BOX ) || ( style & wxSYSTEM_MENU ) )
+        {
+            windowstyle |= NSTitledWindowMask ;
+        }
     }
     else if ( ( style & wxPOPUP_WINDOW ) )
     {
@@ -355,7 +452,7 @@ long style, long extraStyle, const wxString& name )
 
     [m_macWindow setDelegate:controller];
     
-    // [m_macWindow makeKeyAndOrderFront:nil];
+    [m_macWindow setAcceptsMouseMovedEvents: YES];
 }
 
 
@@ -378,7 +475,7 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
 {
     if ( show )
     {
-        [m_macWindow orderFront:nil];
+        [m_macWindow makeKeyAndOrderFront:nil];
         [[m_macWindow contentView] setNeedsDisplay:YES];
     }
     else 
@@ -386,7 +483,7 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
     return true;
 }
     
-bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout)
+bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
 {
     return Show(show);
 }
@@ -402,7 +499,7 @@ bool wxNonOwnedWindowCocoaImpl::SetTransparent(wxByte alpha)
     return true;
 }
 
-bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& col )
+bool wxNonOwnedWindowCocoaImpl::SetBackgroundColour(const wxColour& WXUNUSED(col) )
 {
     return true;
 }
@@ -415,16 +512,16 @@ void wxNonOwnedWindowCocoaImpl::SetExtraStyle( long exStyle )
         int windowStyle = [ m_macWindow styleMask];
         if ( metal && !(windowStyle & NSTexturedBackgroundWindowMask) )
         {
-            wxFAIL_MSG( _T("Metal Style cannot be changed after creation") );
+            wxFAIL_MSG( wxT("Metal Style cannot be changed after creation") );
         }
         else if ( !metal && (windowStyle & NSTexturedBackgroundWindowMask ) )
         {
-            wxFAIL_MSG( _T("Metal Style cannot be changed after creation") );
+            wxFAIL_MSG( wxT("Metal Style cannot be changed after creation") );
         }        
     }
 }
     
-bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle style)
+bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
 {
     return true;
 }
@@ -451,20 +548,22 @@ void wxNonOwnedWindowCocoaImpl::GetPosition( int &x, int &y ) const
 void wxNonOwnedWindowCocoaImpl::GetSize( int &width, int &height ) const
 {
     NSRect rect = [m_macWindow frame];
-    width = rect.size.width;
-    height = rect.size.height;
+    width = (int)rect.size.width;
+    height = (int)rect.size.height;
 }
 
-void wxNonOwnedWindowCocoaImpl::GetContentArea( int& left, int &right, int &width, int &height ) const
+void wxNonOwnedWindowCocoaImpl::GetContentArea( int& left, int &top, int &width, int &height ) const
 {
     NSRect outer = NSMakeRect(100,100,100,100);
     NSRect content = [NSWindow contentRectForFrameRect:outer styleMask:[m_macWindow styleMask] ];
     NSRect rect = [[m_macWindow contentView] frame];
-    width = rect.size.width;
-    height = rect.size.height;
+    left = (int)rect.origin.x;
+    top = (int)rect.origin.y;
+    width = (int)rect.size.width;
+    height = (int)rect.size.height;
 }
     
-bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& region)
+bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& WXUNUSED(region))
 {
     return false;
 }
@@ -492,7 +591,7 @@ void wxNonOwnedWindowCocoaImpl::Iconize( bool iconize )
         [m_macWindow deminiaturize:nil];
 }
     
-void wxNonOwnedWindowCocoaImpl::Maximize(bool maximize)
+void wxNonOwnedWindowCocoaImpl::Maximize(bool WXUNUSED(maximize))
 {
     [m_macWindow zoom:nil];
 }
@@ -511,7 +610,7 @@ bool wxNonOwnedWindowCocoaImpl::IsFullScreen() const
     return m_macFullScreenData != NULL ;
 }
     
-bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long style)
+bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
 {
     if ( show )
     {