X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08c1b1340d318dfdbdec8bd2723925c2ec404386..7e4952db837344e369ff9ccc7ece1f7b8c207cf1:/src/osx/cocoa/window.mm

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index b5a0f099e5..822bf528c7 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -73,6 +73,8 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
 - (void)setImage:(NSImage *)image;
 - (void)setControlSize:(NSControlSize)size;
 
+- (void)setFont:(NSFont *)fontObject;
+
 - (id)contentView;
 
 - (void)setTarget:(id)anObject;
@@ -134,8 +136,8 @@ long wxOSXTranslateCocoaKey( NSEvent* event )
                     retval = WXK_HELP;
                     break;
                 default:
-                    int intchar = [[event characters] characterAtIndex: 0];
-                    if ( intchar >= NSF1FunctionKey && intchar >= NSF24FunctionKey )
+                    int intchar = [s characterAtIndex: 0];
+                    if ( intchar >= NSF1FunctionKey && intchar <= NSF24FunctionKey )
                         retval = WXK_F1 + (intchar - NSF1FunctionKey );
                     break;
             }
@@ -535,6 +537,15 @@ BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event)
     return impl->performKeyEquivalent(event, self, _cmd);
 }
 
+BOOL wxOSX_acceptsFirstResponder(NSView* self, SEL _cmd)
+{
+    wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
+    if (impl == NULL)
+        return NO;
+        
+    return impl->acceptsFirstResponder(self, _cmd);
+}
+
 BOOL wxOSX_becomeFirstResponder(NSView* self, SEL _cmd)
 {
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
@@ -780,12 +791,24 @@ bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, voi
     return superimpl(slf, (SEL)_cmd, event);
 }
 
+bool wxWidgetCocoaImpl::acceptsFirstResponder(WXWidget slf, void *_cmd)
+{
+    // FIXME: We need to find a way to query AcceptsFocus here, but when we do it
+    // it calls native APIs which lead us back here and into a loop.
+    wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+    return superimpl(slf, (SEL)_cmd);
+}
+
 bool wxWidgetCocoaImpl::becomeFirstResponder(WXWidget slf, void *_cmd)
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
+    // get the current focus before running becomeFirstResponder
+    NSResponder* currentResponder = [[NSApp keyWindow] firstResponder]; 
+    NSView* otherView = (currentResponder != nil && [currentResponder isKindOfClass:[NSView class]]) ? (NSView*) currentResponder : NULL; 
+    wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     BOOL r = superimpl(slf, (SEL)_cmd);
     if ( r )
-        DoNotifyFocusEvent( true );
+        DoNotifyFocusEvent( true, otherWindow );
     return r;
 }
 
@@ -793,8 +816,12 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd)
 {
     wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
     BOOL r = superimpl(slf, (SEL)_cmd);
+    // get the current focus after running resignFirstResponder
+    NSResponder* currentResponder = [[NSApp keyWindow] firstResponder]; 
+    NSView* otherView = (currentResponder != nil && [currentResponder isKindOfClass:[NSView class]]) ? (NSView*) currentResponder : NULL; 
+    wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     if ( r )
-        DoNotifyFocusEvent( false );
+        DoNotifyFocusEvent( false, otherWindow );
     return r;
 }
 
@@ -943,6 +970,7 @@ void wxOSXCocoaClassAddWXMethods(Class c)
 
     wxOSX_CLASS_ADD_METHOD(c, @selector(performKeyEquivalent:), (IMP) wxOSX_performKeyEquivalent, "v@:@" )
 
+    wxOSX_CLASS_ADD_METHOD(c, @selector(acceptsFirstResponder), (IMP) wxOSX_acceptsFirstResponder, "c@:" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(becomeFirstResponder), (IMP) wxOSX_becomeFirstResponder, "c@:" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(resignFirstResponder), (IMP) wxOSX_resignFirstResponder, "c@:" )
     wxOSX_CLASS_ADD_METHOD(c, @selector(resetCursorRects), (IMP) wxOSX_resetCursorRects, "v@:" )
@@ -1052,7 +1080,7 @@ void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
     wxWindowMac* parent = GetWXPeer()->GetParent();
     // under Cocoa we might have a contentView in the wxParent to which we have to 
     // adjust the coordinates
-    if (parent)
+    if (parent && [m_osxView superview] != parent->GetHandle() )
     {
         int cx = 0,cy = 0,cw = 0,ch = 0;
         if ( parent->GetPeer() )
@@ -1062,8 +1090,10 @@ void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
             y -= cy;
         }
     }
+    [[m_osxView superview] setNeedsDisplayInRect:[m_osxView frame]];
     NSRect r = wxToNSRect( [m_osxView superview], wxRect(x,y,width, height) );
     [m_osxView setFrame:r];
+    [[m_osxView superview] setNeedsDisplayInRect:r]; 
     
     if ([m_osxView respondsToSelector:@selector(trackingTag)] )
     {
@@ -1256,7 +1286,7 @@ void wxWidgetCocoaImpl::SetupTabs( const wxNotebook& notebook)
 void wxWidgetCocoaImpl::GetBestRect( wxRect *r ) const
 {
     r->x = r->y = r->width = r->height = 0;
-//    if (  [m_osxView isKindOfClass:[NSControl class]] )
+
     if (  [m_osxView respondsToSelector:@selector(sizeToFit)] )
     {
         NSRect former = [m_osxView frame];
@@ -1319,9 +1349,10 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
         [m_osxView setControlSize:size];
 }
 
-void wxWidgetCocoaImpl::SetFont(wxFont const&, wxColour const&, long, bool)
+void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&, long, bool)
 {
-    // TODO
+    if ([m_osxView respondsToSelector:@selector(setFont:)])
+        [m_osxView setFont: font.GetNSFont()];
 }
 
 void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )
@@ -1344,6 +1375,7 @@ bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text)
 {
     wxKeyEvent wxevent(wxEVT_KEY_DOWN);
     SetupKeyEvent( wxevent, event, text );
+    wxevent.SetEventObject(GetWXPeer());  
 
     return GetWXPeer()->OSXHandleKeyEvent(wxevent);
 }
@@ -1352,7 +1384,7 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
 {
     wxKeyEvent wxevent(wxEVT_KEY_DOWN);
     SetupKeyEvent( wxevent, event );
-    
+    wxevent.SetEventObject(GetWXPeer());    
     bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
 
     // this will fire higher level events, like insertText, to help
@@ -1372,13 +1404,14 @@ bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
     wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );
     wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
     SetupMouseEvent( wxevent , event ) ;
+    wxevent.SetEventObject(GetWXPeer());
     wxevent.m_x = pt.x;
     wxevent.m_y = pt.y;
 
     return GetWXPeer()->HandleWindowEvent(wxevent);
 }
 
-void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus)
+void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow)
 {
     wxWindow* thisWindow = GetWXPeer();
     if ( thisWindow->MacGetTopLevelWindow() && NeedsFocusRect() )
@@ -1399,8 +1432,8 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus)
 
         wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
         event.SetEventObject(thisWindow);
-        // TODO how to find out the targetFocusWindow ?
-        // event.SetWindow(targetFocusWindow);
+        if (otherWindow)
+            event.SetWindow(otherWindow->GetWXPeer());
         thisWindow->HandleWindowEvent(event) ;
     }
     else // !receivedFocuss
@@ -1414,8 +1447,8 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus)
                     
         wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
         event.SetEventObject(thisWindow);
-        // TODO how to find out the targetFocusWindow ?
-        // event.SetWindow(targetFocusWindow);
+        if (otherWindow)
+            event.SetWindow(otherWindow->GetWXPeer());
         thisWindow->HandleWindowEvent(event) ;
     }
 }