X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/030495ecf11a16c27e711f0d812226d6b940d42b..fa6ff5f183975a5e99443296ba20c50f453f36b6:/src/osx/cocoa/window.mm diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index a90434a622..8e579e45d0 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -15,6 +15,7 @@ #include "wx/dcclient.h" #include "wx/nonownedwnd.h" #include "wx/log.h" + #include "wx/textctrl.h" #endif #ifdef __WXMAC__ @@ -31,6 +32,10 @@ #include "wx/dnd.h" #endif +#if wxUSE_TOOLTIPS + #include "wx/tooltip.h" +#endif + #include // Get the window with the focus @@ -40,7 +45,7 @@ NSView* GetViewFromResponder( NSResponder* responder ) NSView* view = nil; if ( [responder isKindOfClass:[NSTextView class]] ) { - NSView* delegate = [(NSTextView*)responder delegate]; + NSView* delegate = (NSView*) [(NSTextView*)responder delegate]; if ( [delegate isKindOfClass:[NSTextField class] ] ) view = delegate; else @@ -82,11 +87,20 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const @interface wxNSView : NSView { NSTrackingRectTag rectTag; +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 + NSTrackingArea* _trackingArea; +#endif } // the tracking tag is needed to track mouse enter / exit events - (void) setTrackingTag: (NSTrackingRectTag)tag; - (NSTrackingRectTag) trackingTag; +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 +// under 10.5 we can also track mouse moved events on non-focused windows if +// we use the new NSTrackingArea APIs. +- (void) updateTrackingArea; +- (NSTrackingArea*) trackingArea; +#endif @end // wxNSView @interface NSView(PossibleMethods) @@ -117,6 +131,7 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const - (void)setAction:(SEL)aSelector; - (void)setDoubleAction:(SEL)aSelector; - (void)setBackgroundColor:(NSColor*)aColor; +- (void)setTextColor:(NSColor *)color; - (void)setImagePosition:(NSCellImagePosition)aPosition; @end @@ -293,7 +308,7 @@ void wxWidgetCocoaImpl::SetupKeyEvent(wxKeyEvent &wxevent , NSEvent * nsEvent, N wxString chars; if ( eventType != NSFlagsChanged ) { - NSString* nschars = (wxevent.GetEventType() != wxEVT_CHAR) ? [nsEvent charactersIgnoringModifiers] : [nsEvent characters]; + NSString* nschars = [nsEvent charactersIgnoringModifiers]; if ( charString ) { // if charString is set, it did not come from key up / key down @@ -366,6 +381,14 @@ void wxWidgetCocoaImpl::SetupKeyEvent(wxKeyEvent &wxevent , NSEvent * nsEvent, N UInt32 g_lastButton = 0 ; bool g_lastButtonWasFakeRight = false ; +// better scroll wheel support +// see http://lists.apple.com/archives/cocoa-dev/2007/Feb/msg00050.html + +@interface NSEvent (DeviceDelta) +- (float)deviceDeltaX; +- (float)deviceDeltaY; +@end + void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) { int eventType = [nsEvent type]; @@ -499,19 +522,43 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve case NSScrollWheel : { + float deltaX = 0.0; + float deltaY = 0.0; + wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ; + + // see http://developer.apple.com/qa/qa2005/qa1453.html + // for more details on why we have to look for the exact type + + const EventRef cEvent = (EventRef) [nsEvent eventRef]; + bool isMouseScrollEvent = false; + if ( cEvent ) + isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll; + + if ( isMouseScrollEvent ) + { + deltaX = [nsEvent deviceDeltaX]; + deltaY = [nsEvent deviceDeltaY]; + } + else + { + deltaX = ([nsEvent deltaX] * 10); + deltaY = ([nsEvent deltaY] * 10); + } + wxevent.m_wheelDelta = 10; wxevent.m_linesPerAction = 1; - - if ( fabs([nsEvent deltaX]) > fabs([nsEvent deltaY]) ) + + if ( fabs(deltaX) > fabs(deltaY) ) { wxevent.m_wheelAxis = 1; - wxevent.m_wheelRotation = (int)([nsEvent deltaX] * 10); + wxevent.m_wheelRotation = (int)deltaX; } else { - wxevent.m_wheelRotation = (int)([nsEvent deltaY] * 10); + wxevent.m_wheelRotation = (int)deltaY; } + } break ; @@ -562,6 +609,28 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve return rectTag; } +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 +- (void) updateTrackingArea +{ + if (_trackingArea) + { + [self removeTrackingArea: _trackingArea]; + [_trackingArea release]; + } + + NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited|NSTrackingMouseMoved|NSTrackingActiveAlways; + + NSTrackingArea* area = [[NSTrackingArea alloc] initWithRect: [self bounds] options: options owner: self userInfo: nil]; + [self addTrackingArea: area]; + + _trackingArea = area; +} + +- (NSTrackingArea*) trackingArea +{ + return _trackingArea; +} +#endif @end // wxNSView // @@ -620,6 +689,13 @@ void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event) impl->mouseEvent(event, self, _cmd); } +BOOL wxOSX_acceptsFirstMouse(NSView* WXUNUSED(self), SEL WXUNUSED(_cmd), NSEvent *WXUNUSED(event)) +{ + // This is needed to support click through, otherwise the first click on a window + // will not do anything unless it is the active window already. + return YES; +} + void wxOSX_keyEvent(NSView* self, SEL _cmd, NSEvent *event) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); @@ -809,7 +885,7 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget WXUNUSED(slf), result = wxDragCopy; else if ( sourceDragMask & NSDragOperationMove ) result = wxDragMove; - + PasteboardRef pboardRef; PasteboardCreate((CFStringRef)[pboard name], &pboardRef); target->SetCurrentDragPasteboard(pboardRef); @@ -1053,6 +1129,18 @@ void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNU { } +void wxWidgetCocoaImpl::controlTextDidChange() +{ + wxWindow* wxpeer = (wxWindow*)GetWXPeer(); + if ( wxpeer ) + { + wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, wxpeer->GetId()); + event.SetEventObject( wxpeer ); + event.SetString( static_cast(wxpeer)->GetValue() ); + wxpeer->HandleWindowEvent( event ); + } +} + // #if OBJC_API_VERSION >= 2 @@ -1088,6 +1176,8 @@ void wxOSXCocoaClassAddWXMethods(Class c) wxOSX_CLASS_ADD_METHOD(c, @selector(mouseDragged:), (IMP) wxOSX_mouseEvent, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(rightMouseDragged:), (IMP) wxOSX_mouseEvent, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(otherMouseDragged:), (IMP) wxOSX_mouseEvent, "v@:@" ) + + wxOSX_CLASS_ADD_METHOD(c, @selector(acceptsFirstMouse:), (IMP) wxOSX_acceptsFirstMouse, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(scrollWheel:), (IMP) wxOSX_mouseEvent, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(mouseEntered:), (IMP) wxOSX_mouseEvent, "v@:@" ) @@ -1243,6 +1333,7 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible ) - (void)animationDidEnd:(NSAnimation*)animation { + wxUnusedVar(animation); m_isDone = true; } @@ -1476,13 +1567,19 @@ void wxWidgetCocoaImpl::Move(int x, int y, int width, int height) [m_osxView setFrame:r]; [[m_osxView superview] setNeedsDisplayInRect:r]; + wxNSView* wxview = (wxNSView*)m_osxView; +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 + if ([wxview respondsToSelector:@selector(updateTrackingArea)] ) + [wxview updateTrackingArea]; +#else if ([m_osxView respondsToSelector:@selector(trackingTag)] ) { - if ( [(wxNSView*)m_osxView trackingTag] ) - [m_osxView removeTrackingRect: [(wxNSView*)m_osxView trackingTag]]; + if ( [wxview trackingTag] ) + [wxview removeTrackingRect: [wxview trackingTag]]; - [(wxNSView*)m_osxView setTrackingTag: [m_osxView addTrackingRect: [m_osxView bounds] owner: m_osxView userData: nil assumeInside: NO]]; + [wxview setTrackingTag: [wxview addTrackingRect: [m_osxView bounds] owner: wxview userData: nil assumeInside: NO]]; } +#endif } void wxWidgetCocoaImpl::GetPosition( int &x, int &y ) const @@ -1549,11 +1646,11 @@ bool wxWidgetCocoaImpl::HasFocus() const bool wxWidgetCocoaImpl::SetFocus() { - if ( [m_osxView canBecomeKeyView] == NO ) + if ( !CanFocus() ) return false; - [[m_osxView window] makeFirstResponder: m_osxView] ; [[m_osxView window] makeKeyAndOrderFront:nil] ; + [[m_osxView window] makeFirstResponder: m_osxView] ; return true; } @@ -1793,10 +1890,27 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) } } -void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&, long, bool) +void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&col, long, bool) { if ([m_osxView respondsToSelector:@selector(setFont:)]) [m_osxView setFont: font.OSXGetNSFont()]; + if ([m_osxView respondsToSelector:@selector(setTextColor:)]) + [m_osxView setTextColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0) + green:(CGFloat) (col.Green() / 255.0) + blue:(CGFloat) (col.Blue() / 255.0) + alpha:(CGFloat) (col.Alpha() / 255.0)]]; +} + +void wxWidgetCocoaImpl::SetToolTip(wxToolTip* tooltip) +{ + if (tooltip) + { + wxCFStringRef cf( tooltip->GetTip() , m_wxPeer->GetFont().GetEncoding() ); + [m_osxView setToolTip: cf.AsNSString()]; + } + else + [m_osxView setToolTip: nil]; + } void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control ) @@ -1836,10 +1950,20 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event) { if ( !result ) { - if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) - [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]]; + if ( wxevent.GetKeyCode() < WXK_SPACE || wxevent.GetKeyCode() == WXK_DELETE || wxevent.GetKeyCode() >= WXK_START ) + { + // eventually we could setup a doCommandBySelector catcher and retransform this into the wx key chars + wxKeyEvent wxevent2(wxevent) ; + wxevent2.SetEventType(wxEVT_CHAR); + GetWXPeer()->OSXHandleKeyEvent(wxevent2); + } else - [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]]; + { + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]]; + else + [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]]; + } result = true; } }