X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b42865cee49d490ae0d0bf0951d6449ef7e93025..ca6911c361b04290fe1f0e64b616249b3b3d71ba:/src/osx/cocoa/window.mm diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 1350349f94..cf91905014 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -31,6 +31,29 @@ #include +// Get the window with the focus + +WXWidget wxWidgetImpl::FindFocus() +{ + NSView* focusedView = nil; + NSWindow* keyWindow = [[NSApplication sharedApplication] keyWindow]; + if ( keyWindow != nil ) + { + NSResponder* responder = [keyWindow firstResponder]; + if ( [responder isKindOfClass:[NSTextView class]] && + [keyWindow fieldEditor:NO forObject:nil] != nil ) + { + focusedView = [(NSTextView*)responder delegate]; + } + else + { + if ( [responder isKindOfClass:[NSView class]] ) + focusedView = (NSView*) responder; + } + } + return focusedView; +} + NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin ) { int x, y, w, h ; @@ -47,7 +70,6 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const NSTrackingRectTag rectTag; } -- (BOOL) canBecomeKeyView; // the tracking tag is needed to track mouse enter / exit events - (void) setTrackingTag: (NSTrackingRectTag)tag; - (NSTrackingRectTag) trackingTag; @@ -73,6 +95,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; @@ -437,11 +461,6 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) } } -- (BOOL) canBecomeKeyView -{ - return YES; -} - - (void) setTrackingTag: (NSTrackingRectTag)tag { rectTag = tag; @@ -607,7 +626,7 @@ void wxOSX_controlDoubleAction(NSView* self, SEL _cmd, id sender) impl->controlDoubleAction(self, _cmd, sender); } -unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget slf, void *_cmd) +unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd)) { id sender = (id ) s; NSPasteboard *pboard = [sender draggingPasteboard]; @@ -652,7 +671,7 @@ unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget slf, void *_cm return nsresult; } -void wxWidgetCocoaImpl::draggingExited(void* s, WXWidget slf, void *_cmd) +void wxWidgetCocoaImpl::draggingExited(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd)) { id sender = (id ) s; NSPasteboard *pboard = [sender draggingPasteboard]; @@ -672,7 +691,7 @@ void wxWidgetCocoaImpl::draggingExited(void* s, WXWidget slf, void *_cmd) CFRelease(pboardRef); } -unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget slf, void *_cmd) +unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd)) { id sender = (id ) s; NSPasteboard *pboard = [sender draggingPasteboard]; @@ -717,7 +736,7 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget slf, void *_cm return nsresult; } -bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget slf, void *_cmd) +bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd)) { id sender = (id ) s; @@ -791,21 +810,26 @@ bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, voi 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); + if ( m_wxPeer->MacIsUserPane() ) + return m_wxPeer->AcceptsFocus(); + else + { + 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 - NSView* otherView = [[NSApp keyWindow] firstResponder]; + NSView* otherView = FindFocus(); wxWidgetImpl* otherWindow = FindFromWXWidget(otherView); BOOL r = superimpl(slf, (SEL)_cmd); if ( r ) + { DoNotifyFocusEvent( true, otherWindow ); + } return r; } @@ -814,10 +838,14 @@ 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 - NSView* otherView = [[NSApp keyWindow] firstResponder]; + NSView* otherView = FindFocus(); wxWidgetImpl* otherWindow = FindFromWXWidget(otherView); - if ( r ) + // NSTextViews have an editor as true responder, therefore the might get the + // resign notification if their editor takes over, don't trigger any event hen + if ( r && otherWindow != this) + { DoNotifyFocusEvent( false, otherWindow ); + } return r; } @@ -840,7 +868,7 @@ void wxWidgetCocoaImpl::resetCursorRects(WXWidget slf, void *_cmd) } } -bool wxWidgetCocoaImpl::isFlipped(WXWidget slf, void *_cmd) +bool wxWidgetCocoaImpl::isFlipped(WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd)) { return m_isFlipped; } @@ -848,7 +876,7 @@ bool wxWidgetCocoaImpl::isFlipped(WXWidget slf, void *_cmd) #define OSX_DEBUG_DRAWING 0 -void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd) +void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd)) { CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort]; CGContextSaveGState( context ); @@ -907,14 +935,14 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd) CGContextRestoreGState( context ); } -void wxWidgetCocoaImpl::controlAction( WXWidget slf, void *_cmd, void *sender) +void wxWidgetCocoaImpl::controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender)) { wxWindow* wxpeer = (wxWindow*) GetWXPeer(); if ( wxpeer ) wxpeer->OSXHandleClicked(0); } -void wxWidgetCocoaImpl::controlDoubleAction( WXWidget slf, void *_cmd, void *sender) +void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender)) { } @@ -1055,7 +1083,7 @@ void wxWidgetCocoaImpl::Lower() { } -void wxWidgetCocoaImpl::ScrollRect( const wxRect *rect, int dx, int dy ) +void wxWidgetCocoaImpl::ScrollRect( const wxRect *WXUNUSED(rect), int WXUNUSED(dx), int WXUNUSED(dy) ) { #if 1 SetNeedsDisplay() ; @@ -1076,7 +1104,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() ) @@ -1086,8 +1114,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)] ) { @@ -1157,7 +1187,7 @@ bool wxWidgetCocoaImpl::CanFocus() const bool wxWidgetCocoaImpl::HasFocus() const { - return ( [[m_osxView window] firstResponder] == m_osxView ); + return ( FindFocus() == m_osxView ); } bool wxWidgetCocoaImpl::SetFocus() @@ -1191,12 +1221,12 @@ void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding { if ( [m_osxView respondsToSelector:@selector(setTitle:) ] ) { - wxCFStringRef cf( title , m_wxPeer->GetFont().GetEncoding() ); + wxCFStringRef cf( title , encoding ); [m_osxView setTitle:cf.AsNSString()]; } else if ( [m_osxView respondsToSelector:@selector(setStringValue:) ] ) { - wxCFStringRef cf( title , m_wxPeer->GetFont().GetEncoding() ); + wxCFStringRef cf( title , encoding ); [m_osxView setStringValue:cf.AsNSString()]; } } @@ -1272,7 +1302,7 @@ void wxWidgetCocoaImpl::SetBitmap( const wxBitmap& bitmap ) } } -void wxWidgetCocoaImpl::SetupTabs( const wxNotebook& notebook) +void wxWidgetCocoaImpl::SetupTabs( const wxNotebook& WXUNUSED(notebook)) { // implementation in subclass } @@ -1309,7 +1339,7 @@ void wxWidgetCocoaImpl::PulseGauge() { } -void wxWidgetCocoaImpl::SetScrollThumb( wxInt32 val, wxInt32 view ) +void wxWidgetCocoaImpl::SetScrollThumb( wxInt32 WXUNUSED(val), wxInt32 WXUNUSED(view) ) { } @@ -1346,11 +1376,7 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&, long, bool) { if ([m_osxView respondsToSelector:@selector(setFont:)]) -#if wxOSX_USE_CORE_TEXT - [m_osxView setFont: (CTFontRef)font.MacGetCTFont()]; -#else - -#endif + [m_osxView setFont: font.OSXGetNSFont()]; } void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control ) @@ -1483,8 +1509,9 @@ void wxWidgetCocoaImpl::SetFlipped(bool flipped) // Factory methods // -wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, long extraStyle) +wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent), + wxWindowID WXUNUSED(id), const wxPoint& pos, const wxSize& size, + long WXUNUSED(style), long WXUNUSED(extraStyle)) { NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; wxNSView* v = [[wxNSView alloc] initWithFrame:r];