X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/094898332baf2e46ed876ec4cae657fbaa098570..33820d94285c0004acce756e7d10d9698e6387d1:/src/osx/cocoa/window.mm diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 479d0c776c..9ce10cc02c 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -31,6 +31,41 @@ #include +// Get the window with the focus + +NSView* GetViewFromResponder( NSResponder* responder ) +{ + NSView* view = nil; + if ( [responder isKindOfClass:[NSTextView class]] ) + { + NSView* delegate = [(NSTextView*)responder delegate]; + if ( [delegate isKindOfClass:[NSTextField class] ] ) + view = delegate; + else + view = (NSView*) responder; + } + else + { + if ( [responder isKindOfClass:[NSView class]] ) + view = (NSView*) responder; + } + return view; +} + +NSView* GetFocusedViewInWindow( NSWindow* keyWindow ) +{ + NSView* focusedView = nil; + if ( keyWindow != nil ) + focusedView = GetViewFromResponder([keyWindow firstResponder]); + + return focusedView; +} + +WXWidget wxWidgetImpl::FindFocus() +{ + return GetFocusedViewInWindow( [[NSApplication sharedApplication] keyWindow] ); +} + NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin ) { int x, y, w, h ; @@ -44,13 +79,15 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const @interface wxNSView : NSView { + NSTrackingRectTag rectTag; } -- (BOOL) canBecomeKeyView; - +// the tracking tag is needed to track mouse enter / exit events +- (void) setTrackingTag: (NSTrackingRectTag)tag; +- (NSTrackingRectTag) trackingTag; @end // wxNSView -@interface NSView(PossibleMethods) +@interface NSView(PossibleMethods) - (void)setTitle:(NSString *)aString; - (void)setStringValue:(NSString *)aString; - (void)setIntValue:(int)anInt; @@ -70,64 +107,173 @@ 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; - (void)setAction:(SEL)aSelector; - (void)setDoubleAction:(SEL)aSelector; -@end +- (void)setBackgroundColor:(NSColor*)aColor; +- (void)setImagePosition:(NSCellImagePosition)aPosition; +@end -long wxOSXTranslateCocoaKey( int unichar ) +long wxOSXTranslateCocoaKey( NSEvent* event ) { - long retval = unichar; - switch( unichar ) + long retval = 0; + + if ([event type] != NSFlagsChanged) + { + NSString* s = [event charactersIgnoringModifiers]; + // backspace char reports as delete w/modifiers for some reason + if ([s length] == 1) + { + switch ( [s characterAtIndex:0] ) + { + // backspace key + case 0x7F : + case 8 : + retval = WXK_BACK; + break; + case NSUpArrowFunctionKey : + retval = WXK_UP; + break; + case NSDownArrowFunctionKey : + retval = WXK_DOWN; + break; + case NSLeftArrowFunctionKey : + retval = WXK_LEFT; + break; + case NSRightArrowFunctionKey : + retval = WXK_RIGHT; + break; + case NSInsertFunctionKey : + retval = WXK_INSERT; + break; + case NSDeleteFunctionKey : + retval = WXK_DELETE; + break; + case NSHomeFunctionKey : + retval = WXK_HOME; + break; + // case NSBeginFunctionKey : + // retval = WXK_BEGIN; + // break; + case NSEndFunctionKey : + retval = WXK_END; + break; + case NSPageUpFunctionKey : + retval = WXK_PAGEUP; + break; + case NSPageDownFunctionKey : + retval = WXK_PAGEDOWN; + break; + case NSHelpFunctionKey : + retval = WXK_HELP; + break; + default: + int intchar = [s characterAtIndex: 0]; + if ( intchar >= NSF1FunctionKey && intchar <= NSF24FunctionKey ) + retval = WXK_F1 + (intchar - NSF1FunctionKey ); + break; + } + } + } + + // Some keys don't seem to have constants. The code mimics the approach + // taken by WebKit. See: + // http://trac.webkit.org/browser/trunk/WebCore/platform/mac/KeyEventMac.mm + switch( [event keyCode] ) { - case NSUpArrowFunctionKey : - retval = WXK_UP; + // command key + case 54: + case 55: + retval = WXK_COMMAND; break; - case NSDownArrowFunctionKey : - retval = WXK_DOWN; + // caps locks key + case 57: // Capslock + retval = WXK_CAPITAL; break; - case NSLeftArrowFunctionKey : - retval = WXK_LEFT; + // shift key + case 56: // Left Shift + case 60: // Right Shift + retval = WXK_SHIFT; break; - case NSRightArrowFunctionKey : - retval = WXK_RIGHT; + // alt key + case 58: // Left Alt + case 61: // Right Alt + retval = WXK_ALT; break; - case NSInsertFunctionKey : - retval = WXK_INSERT; + // ctrl key + case 59: // Left Ctrl + case 62: // Right Ctrl + retval = WXK_CONTROL; break; - case NSDeleteFunctionKey : - retval = WXK_DELETE; + // clear key + case 71: + retval = WXK_CLEAR; break; - case NSHomeFunctionKey : - retval = WXK_HOME; + // tab key + case 48: + retval = WXK_TAB; break; -// case NSBeginFunctionKey : -// retval = WXK_BEGIN; -// break; - case NSEndFunctionKey : - retval = WXK_END; + + case 75: // / + retval = WXK_NUMPAD_DIVIDE; break; - case NSPageUpFunctionKey : - retval = WXK_PAGEUP; + case 67: // * + retval = WXK_NUMPAD_MULTIPLY; break; - case NSPageDownFunctionKey : - retval = WXK_PAGEDOWN; + case 78: // - + retval = WXK_NUMPAD_SUBTRACT; break; - case NSHelpFunctionKey : - retval = WXK_HELP; + case 69: // + + retval = WXK_NUMPAD_ADD; break; - - default : - if ( unichar >= NSF1FunctionKey && unichar >= NSF24FunctionKey ) - retval = WXK_F1 + (unichar - NSF1FunctionKey ); + case 76: // Enter + retval = WXK_NUMPAD_ENTER; + break; + case 65: // . + retval = WXK_NUMPAD_DECIMAL; + break; + case 82: // 0 + retval = WXK_NUMPAD0; + break; + case 83: // 1 + retval = WXK_NUMPAD1; + break; + case 84: // 2 + retval = WXK_NUMPAD2; + break; + case 85: // 3 + retval = WXK_NUMPAD3; + break; + case 86: // 4 + retval = WXK_NUMPAD4; + break; + case 87: // 5 + retval = WXK_NUMPAD5; + break; + case 88: // 6 + retval = WXK_NUMPAD6; + break; + case 89: // 7 + retval = WXK_NUMPAD7; + break; + case 91: // 8 + retval = WXK_NUMPAD8; + break; + case 92: // 9 + retval = WXK_NUMPAD9; + break; + default: + //retval = [event keyCode]; break; } return retval; } -void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent ) +void wxWidgetCocoaImpl::SetupKeyEvent(wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charString) { UInt32 modifiers = [nsEvent modifierFlags] ; int eventType = [nsEvent type]; @@ -136,52 +282,89 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent ) wxevent.m_controlDown = modifiers & NSControlKeyMask; wxevent.m_altDown = modifiers & NSAlternateKeyMask; wxevent.m_metaDown = modifiers & NSCommandKeyMask; - + wxevent.m_rawCode = [nsEvent keyCode]; wxevent.m_rawFlags = modifiers; - - wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ; - switch (eventType) - { - case NSKeyDown : - wxevent.SetEventType( wxEVT_KEY_DOWN ) ; - break; - case NSKeyUp : - wxevent.SetEventType( wxEVT_KEY_UP ) ; - break; - case NSFlagsChanged : - // setup common code here - break; - default : - break ; - } + + wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ; wxString chars; if ( eventType != NSFlagsChanged ) { - NSString* nschars = [nsEvent characters]; - if ( nschars ) + NSString* nschars = (wxevent.GetEventType() != wxEVT_CHAR) ? [nsEvent charactersIgnoringModifiers] : [nsEvent characters]; + if ( charString ) { - wxCFStringRef cfchars((CFStringRef)[nschars retain]); - chars = cfchars.AsString(); + // if charString is set, it did not come from key up / key down + wxevent.SetEventType( wxEVT_CHAR ); + chars = wxCFStringRef::AsString(charString); + } + else if ( nschars ) + { + chars = wxCFStringRef::AsString(nschars); + } + } + + int aunichar = chars.Length() > 0 ? chars[0] : 0; + long keyval = 0; + + if (wxevent.GetEventType() != wxEVT_CHAR) + { + keyval = wxOSXTranslateCocoaKey(nsEvent) ; + switch (eventType) + { + case NSKeyDown : + wxevent.SetEventType( wxEVT_KEY_DOWN ) ; + break; + case NSKeyUp : + wxevent.SetEventType( wxEVT_KEY_UP ) ; + break; + case NSFlagsChanged : + switch (keyval) + { + case WXK_CONTROL: + wxevent.SetEventType( wxevent.m_controlDown ? wxEVT_KEY_DOWN : wxEVT_KEY_UP); + break; + case WXK_SHIFT: + wxevent.SetEventType( wxevent.m_shiftDown ? wxEVT_KEY_DOWN : wxEVT_KEY_UP); + break; + case WXK_ALT: + wxevent.SetEventType( wxevent.m_altDown ? wxEVT_KEY_DOWN : wxEVT_KEY_UP); + break; + case WXK_COMMAND: + wxevent.SetEventType( wxevent.m_metaDown ? wxEVT_KEY_DOWN : wxEVT_KEY_UP); + break; + } + break; + default : + break ; } } - - int unichar = chars.Length() > 0 ? chars[0] : 0; - long keyval = wxOSXTranslateCocoaKey(unichar) ; - if ( keyval == unichar && ( wxevent.GetEventType() == wxEVT_KEY_UP || wxevent.GetEventType() == wxEVT_KEY_DOWN ) ) - keyval = wxToupper( keyval ) ; + + if ( !keyval ) + { + if ( wxevent.GetEventType() == wxEVT_KEY_UP || wxevent.GetEventType() == wxEVT_KEY_DOWN ) + keyval = wxToupper( aunichar ) ; + else + keyval = aunichar; + } #if wxUSE_UNICODE - wxevent.m_uniChar = unichar; + wxevent.m_uniChar = aunichar; #endif wxevent.m_keyCode = keyval; + + wxWindowMac* peer = GetWXPeer(); + if ( peer ) + { + wxevent.SetEventObject(peer); + wxevent.SetId(peer->GetId()) ; + } } UInt32 g_lastButton = 0 ; bool g_lastButtonWasFakeRight = false ; -void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) +void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) { int eventType = [nsEvent type]; UInt32 modifiers = [nsEvent modifierFlags] ; @@ -190,8 +373,6 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) // these parameters are not given for all events UInt32 button = [nsEvent buttonNumber]; UInt32 clickCount = 0; - if ( eventType != NSScrollWheel ) - [nsEvent clickCount]; wxevent.m_x = screenMouseLocation.x; wxevent.m_y = screenMouseLocation.y; @@ -199,10 +380,9 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) wxevent.m_controlDown = modifiers & NSControlKeyMask; wxevent.m_altDown = modifiers & NSAlternateKeyMask; wxevent.m_metaDown = modifiers & NSCommandKeyMask; - wxevent.m_clickCount = clickCount; - wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ; + wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ; - UInt32 mouseChord = 0; + UInt32 mouseChord = 0; switch (eventType) { @@ -272,6 +452,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) case NSLeftMouseDown : case NSRightMouseDown : case NSOtherMouseDown : + clickCount = [nsEvent clickCount]; switch ( button ) { case 0 : @@ -294,6 +475,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) case NSLeftMouseUp : case NSRightMouseUp : case NSOtherMouseUp : + clickCount = [nsEvent clickCount]; switch ( button ) { case 0 : @@ -316,22 +498,27 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) case NSScrollWheel : { wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ; - wxevent.m_wheelDelta = 1; + wxevent.m_wheelDelta = 10; wxevent.m_linesPerAction = 1; - if ( abs([nsEvent deltaX]) > abs([nsEvent deltaY]) ) + + if ( fabs([nsEvent deltaX]) > fabs([nsEvent deltaY]) ) { wxevent.m_wheelAxis = 1; - wxevent.m_wheelRotation = [nsEvent deltaX] > 0.0 ? 1 : -1; + wxevent.m_wheelRotation = (int)([nsEvent deltaX] * 10); } else { - wxevent.m_wheelRotation = [nsEvent deltaY] > 0.0 ? 1 : -1; + wxevent.m_wheelRotation = (int)([nsEvent deltaY] * 10); } } break ; case NSMouseEntered : + wxevent.SetEventType( wxEVT_ENTER_WINDOW ) ; + break; case NSMouseExited : + wxevent.SetEventType( wxEVT_LEAVE_WINDOW ) ; + break; case NSLeftMouseDragged : case NSRightMouseDragged : case NSOtherMouseDragged : @@ -341,6 +528,14 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) default : break ; } + + wxevent.m_clickCount = clickCount; + wxWindowMac* peer = GetWXPeer(); + if ( peer ) + { + wxevent.SetEventObject(peer); + wxevent.SetId(peer->GetId()) ; + } } @implementation wxNSView @@ -348,16 +543,21 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) + (void)initialize { static BOOL initialized = NO; - if (!initialized) + if (!initialized) { initialized = YES; wxOSXCocoaClassAddWXMethods( self ); } } -- (BOOL) canBecomeKeyView +- (void) setTrackingTag: (NSTrackingRectTag)tag +{ + rectTag = tag; +} + +- (NSTrackingRectTag) trackingTag { - return YES; + return rectTag; } @end // wxNSView @@ -376,7 +576,7 @@ NSDragOperation wxOSX_draggingEntered( id self, SEL _cmd, id sen wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NSDragOperationNone; - + return impl->draggingEntered(sender, self, _cmd); } @@ -385,7 +585,7 @@ void wxOSX_draggingExited( id self, SEL _cmd, id sender ) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return ; - + return impl->draggingExited(sender, self, _cmd); } @@ -394,7 +594,7 @@ NSDragOperation wxOSX_draggingUpdated( id self, SEL _cmd, id sen wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NSDragOperationNone; - + return impl->draggingUpdated(sender, self, _cmd); } @@ -403,43 +603,63 @@ BOOL wxOSX_performDragOperation( id self, SEL _cmd, id sender ) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NSDragOperationNone; - + return impl->performDragOperation(sender, self, _cmd) ? YES:NO ; } -void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event) +#endif + +void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + impl->mouseEvent(event, self, _cmd); } -void wxOSX_keyEvent(NSView* self, SEL _cmd, NSEvent *event) +void wxOSX_keyEvent(NSView* self, SEL _cmd, NSEvent *event) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + impl->keyEvent(event, self, _cmd); } -BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event) +void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text) +{ + wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); + if (impl == NULL) + return; + + impl->insertText(text, self, _cmd); +} + +BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NO; - + 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 ); if (impl == NULL) return NO; - + return impl->becomeFirstResponder(self, _cmd); } @@ -448,7 +668,7 @@ BOOL wxOSX_resignFirstResponder(NSView* self, SEL _cmd) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NO; - + return impl->resignFirstResponder(self, _cmd); } @@ -457,7 +677,7 @@ void wxOSX_resetCursorRects(NSView* self, SEL _cmd) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + impl->resetCursorRects(self, _cmd); } @@ -466,7 +686,7 @@ BOOL wxOSX_isFlipped(NSView* self, SEL _cmd) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NO; - + return impl->isFlipped(self, _cmd) ? YES:NO; } @@ -475,44 +695,45 @@ void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + return impl->drawRect(&rect, self, _cmd); } -void wxOSX_clickedAction(NSView* self, SEL _cmd, id sender) +void wxOSX_controlAction(NSView* self, SEL _cmd, id sender) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - - impl->clickedAction(self, _cmd, sender); + + impl->controlAction(self, _cmd, sender); } -void wxOSX_doubleClickedAction(NSView* self, SEL _cmd, id sender) +void wxOSX_controlDoubleAction(NSView* self, SEL _cmd, id sender) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - - impl->doubleClickedAction(self, _cmd, 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]; NSDragOperation sourceDragMask = [sender draggingSourceOperationMask]; - + wxWindow* wxpeer = GetWXPeer(); if ( wxpeer == NULL ) return NSDragOperationNone; - + wxDropTarget* target = wxpeer->GetDropTarget(); if ( target == NULL ) return NSDragOperationNone; wxDragResult result = wxDragNone; - wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] ); + NSPoint nspoint = [m_osxView convertPoint:[sender draggingLocation] fromView:nil]; + wxPoint pt = wxFromNSPoint( m_osxView, nspoint ); if ( sourceDragMask & NSDragOperationLink ) result = wxDragLink; @@ -521,12 +742,12 @@ unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget slf, void *_cm else if ( sourceDragMask & NSDragOperationMove ) result = wxDragMove; - PasteboardRef pboardRef; + PasteboardRef pboardRef; PasteboardCreate((CFStringRef)[pboard name], &pboardRef); target->SetCurrentDragPasteboard(pboardRef); result = target->OnEnter(pt.x, pt.y, result); CFRelease(pboardRef); - + NSDragOperation nsresult = NSDragOperationNone; switch (result ) { @@ -542,42 +763,43 @@ 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]; - + wxWindow* wxpeer = GetWXPeer(); if ( wxpeer == NULL ) return; - + wxDropTarget* target = wxpeer->GetDropTarget(); if ( target == NULL ) return; - - PasteboardRef pboardRef; + + PasteboardRef pboardRef; PasteboardCreate((CFStringRef)[pboard name], &pboardRef); target->SetCurrentDragPasteboard(pboardRef); target->OnLeave(); 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]; NSDragOperation sourceDragMask = [sender draggingSourceOperationMask]; - + wxWindow* wxpeer = GetWXPeer(); if ( wxpeer == NULL ) return NSDragOperationNone; - + wxDropTarget* target = wxpeer->GetDropTarget(); if ( target == NULL ) return NSDragOperationNone; wxDragResult result = wxDragNone; - wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] ); + NSPoint nspoint = [m_osxView convertPoint:[sender draggingLocation] fromView:nil]; + wxPoint pt = wxFromNSPoint( m_osxView, nspoint ); if ( sourceDragMask & NSDragOperationLink ) result = wxDragLink; @@ -586,12 +808,12 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget slf, void *_cm else if ( sourceDragMask & NSDragOperationMove ) result = wxDragMove; - PasteboardRef pboardRef; + PasteboardRef pboardRef; PasteboardCreate((CFStringRef)[pboard name], &pboardRef); target->SetCurrentDragPasteboard(pboardRef); result = target->OnDragOver(pt.x, pt.y, result); CFRelease(pboardRef); - + NSDragOperation nsresult = NSDragOperationNone; switch (result ) { @@ -607,17 +829,18 @@ 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; NSPasteboard *pboard = [sender draggingPasteboard]; NSDragOperation sourceDragMask = [sender draggingSourceOperationMask]; - + wxWindow* wxpeer = GetWXPeer(); wxDropTarget* target = wxpeer->GetDropTarget(); wxDragResult result = wxDragNone; - wxPoint pt = wxFromNSPoint( m_osxView, [sender draggingLocation] ); + NSPoint nspoint = [m_osxView convertPoint:[sender draggingLocation] fromView:nil]; + wxPoint pt = wxFromNSPoint( m_osxView, nspoint ); if ( sourceDragMask & NSDragOperationLink ) result = wxDragLink; @@ -626,58 +849,90 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget slf, void *_cmd) else if ( sourceDragMask & NSDragOperationMove ) result = wxDragMove; - PasteboardRef pboardRef; + PasteboardRef pboardRef; PasteboardCreate((CFStringRef)[pboard name], &pboardRef); target->SetCurrentDragPasteboard(pboardRef); - result = target->OnData(pt.x, pt.y, result); + + if (target->OnDrop(pt.x, pt.y)) + result = target->OnData(pt.x, pt.y, result); + CFRelease(pboardRef); - + return result != wxDragNone; } -#endif - +typedef void (*wxOSX_TextEventHandlerPtr)(NSView* self, SEL _cmd, NSString *event); typedef void (*wxOSX_EventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event); typedef BOOL (*wxOSX_PerformKeyEventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event); typedef BOOL (*wxOSX_FocusHandlerPtr)(NSView* self, SEL _cmd); typedef BOOL (*wxOSX_ResetCursorRectsHandlerPtr)(NSView* self, SEL _cmd); -typedef BOOL (*wxOSX_DrawRectHandlerPtr)(NSView* self, SEL _cmd, NSRect rect); +typedef void (*wxOSX_DrawRectHandlerPtr)(NSView* self, SEL _cmd, NSRect rect); void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd) { if ( !DoHandleMouseEvent(event) ) { - wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; - superimpl(slf, (SEL)_cmd, event); + // for plain NSView mouse events would propagate to parents otherwise + if (!m_wxPeer->MacIsUserPane()) + { + wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; + superimpl(slf, (SEL)_cmd, event); + } } } void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd) { - if ( !DoHandleKeyEvent(event) ) + if ( [event type] == NSKeyDown ) + m_lastKeyDownEvent = event; + if ( GetFocusedViewInWindow([slf window]) != slf || m_hasEditor || !DoHandleKeyEvent(event) ) { wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; superimpl(slf, (SEL)_cmd, event); } + m_lastKeyDownEvent = NULL; } -bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, void *_cmd) +void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd) { - if ( !DoHandleKeyEvent(event) ) + if ( m_lastKeyDownEvent==NULL || m_hasEditor || !DoHandleCharEvent(m_lastKeyDownEvent, text) ) { - wxOSX_PerformKeyEventHandlerPtr superimpl = (wxOSX_PerformKeyEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; - return superimpl(slf, (SEL)_cmd, event); + wxOSX_TextEventHandlerPtr superimpl = (wxOSX_TextEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; + superimpl(slf, (SEL)_cmd, text); } +} + + +bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, void *_cmd) +{ + wxOSX_PerformKeyEventHandlerPtr superimpl = (wxOSX_PerformKeyEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; + return superimpl(slf, (SEL)_cmd, event); +} - return YES; +bool wxWidgetCocoaImpl::acceptsFirstResponder(WXWidget slf, void *_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 = FindFocus(); + + wxWidgetImpl* otherWindow = FindFromWXWidget(otherView); BOOL r = superimpl(slf, (SEL)_cmd); if ( r ) - DoNotifyFocusEvent( true ); + { + DoNotifyFocusEvent( true, otherWindow ); + } + return r; } @@ -685,8 +940,17 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd) { wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; BOOL r = superimpl(slf, (SEL)_cmd); - if ( r ) - DoNotifyFocusEvent( false ); + // get the current focus after running resignFirstResponder + // note that this value isn't reliable, it might return the same view that + // is resigning + NSView* otherView = FindFocus(); + wxWidgetImpl* otherWindow = FindFromWXWidget(otherView); + // NSTextViews have an editor as true responder, therefore the might get the + // resign notification if their editor takes over, don't trigger any event then + if ( r && !m_hasEditor) + { + DoNotifyFocusEvent( false, otherWindow ); + } return r; } @@ -702,12 +966,14 @@ void wxWidgetCocoaImpl::resetCursorRects(WXWidget slf, void *_cmd) superimpl(slf, (SEL)_cmd); } else + { [slf addCursorRect: [slf bounds] cursor: cursor]; + } } } - -bool wxWidgetCocoaImpl::isFlipped(WXWidget slf, void *_cmd) + +bool wxWidgetCocoaImpl::isFlipped(WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd)) { return m_isFlipped; } @@ -715,11 +981,11 @@ 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 ); - + #if OSX_DEBUG_DRAWING CGContextBeginPath( context ); CGContextMoveToPoint(context, 0, 0); @@ -740,7 +1006,7 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd) CGContextTranslateCTM( context, 0, [m_osxView bounds].size.height ); CGContextScaleCTM( context, 1, -1 ); } - + wxRegion updateRgn; const NSRect *rects; NSInteger count; @@ -754,9 +1020,9 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd) wxWindow* wxpeer = GetWXPeer(); wxpeer->GetUpdateRegion() = updateRgn; wxpeer->MacSetCGContextRef( context ); - + bool handled = wxpeer->MacDoRedraw( 0 ); - + CGContextRestoreGState( context ); CGContextSaveGState( context ); @@ -770,21 +1036,22 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd) CGContextSaveGState( context ); } wxpeer->MacPaintChildrenBorders(); + wxpeer->MacSetCGContextRef( NULL ); CGContextRestoreGState( context ); } -void wxWidgetCocoaImpl::clickedAction( 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::doubleClickedAction( WXWidget slf, void *_cmd, void *sender) +void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender)) { } -// +// #if OBJC_API_VERSION >= 2 @@ -823,14 +1090,16 @@ void wxOSXCocoaClassAddWXMethods(Class c) wxOSX_CLASS_ADD_METHOD(c, @selector(scrollWheel:), (IMP) wxOSX_mouseEvent, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(mouseEntered:), (IMP) wxOSX_mouseEvent, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(mouseExited:), (IMP) wxOSX_mouseEvent, "v@:@" ) - + wxOSX_CLASS_ADD_METHOD(c, @selector(keyDown:), (IMP) wxOSX_keyEvent, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(keyUp:), (IMP) wxOSX_keyEvent, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(flagsChanged:), (IMP) wxOSX_keyEvent, "v@:@" ) - wxOSX_CLASS_ADD_METHOD(c, @selector(performKeyEquivalent:), (IMP) wxOSX_performKeyEquivalent, "v@:@" ) + wxOSX_CLASS_ADD_METHOD(c, @selector(insertText:), (IMP) wxOSX_insertText, "v@:@" ) + wxOSX_CLASS_ADD_METHOD(c, @selector(performKeyEquivalent:), (IMP) wxOSX_performKeyEquivalent, "c@:@" ) + 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@:" ) @@ -838,16 +1107,16 @@ void wxOSXCocoaClassAddWXMethods(Class c) wxOSX_CLASS_ADD_METHOD(c, @selector(isFlipped), (IMP) wxOSX_isFlipped, "c@:" ) wxOSX_CLASS_ADD_METHOD(c, @selector(drawRect:), (IMP) wxOSX_drawRect, "v@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}" ) - wxOSX_CLASS_ADD_METHOD(c, @selector(clickedAction:), (IMP) wxOSX_clickedAction, "v@:@" ) - wxOSX_CLASS_ADD_METHOD(c, @selector(doubleClickedAction:), (IMP) wxOSX_doubleClickedAction, "v@:@" ) + wxOSX_CLASS_ADD_METHOD(c, @selector(controlAction:), (IMP) wxOSX_controlAction, "v@:@" ) + wxOSX_CLASS_ADD_METHOD(c, @selector(controlDoubleAction:), (IMP) wxOSX_controlDoubleAction, "v@:@" ) #if wxUSE_DRAG_AND_DROP wxOSX_CLASS_ADD_METHOD(c, @selector(draggingEntered:), (IMP) wxOSX_draggingEntered, "I@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(draggingUpdated:), (IMP) wxOSX_draggingUpdated, "I@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(draggingExited:), (IMP) wxOSX_draggingExited, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(performDragOperation:), (IMP) wxOSX_performDragOperation, "c@:@" ) -#endif - +#endif + #if OBJC_API_VERSION < 2 } ; static int method_count = WXSIZEOF( wxmethods ); @@ -874,9 +1143,18 @@ wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRoo { Init(); m_osxView = w; + + // check if the user wants to create the control initially hidden + if ( !peer->IsShown() ) + SetVisibility(false); + + // gc aware handling + if ( m_osxView ) + CFRetain(m_osxView); + [m_osxView release]; } -wxWidgetCocoaImpl::wxWidgetCocoaImpl() +wxWidgetCocoaImpl::wxWidgetCocoaImpl() { Init(); } @@ -885,6 +1163,8 @@ void wxWidgetCocoaImpl::Init() { m_osxView = NULL; m_isFlipped = true; + m_lastKeyDownEvent = NULL; + m_hasEditor = false; } wxWidgetCocoaImpl::~wxWidgetCocoaImpl() @@ -897,10 +1177,12 @@ wxWidgetCocoaImpl::~wxWidgetCocoaImpl() if ( sv != nil ) [m_osxView removeFromSuperview]; } - [m_osxView release]; + // gc aware handling + if ( m_osxView ) + CFRelease(m_osxView); } - -bool wxWidgetCocoaImpl::IsVisible() const + +bool wxWidgetCocoaImpl::IsVisible() const { return [m_osxView isHiddenOrHasHiddenAncestor] == NO; } @@ -912,13 +1194,15 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible ) void wxWidgetCocoaImpl::Raise() { + // Not implemented } - + void wxWidgetCocoaImpl::Lower() { + // Not implemented } -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() ; @@ -937,16 +1221,30 @@ void wxWidgetCocoaImpl::ScrollRect( const wxRect *rect, int dx, int dy ) 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 + // 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() ) { - wxPoint pt(parent->GetClientAreaOrigin()); - x -= pt.x; - y -= pt.y; + int cx = 0,cy = 0,cw = 0,ch = 0; + if ( parent->GetPeer() ) + { + parent->GetPeer()->GetContentArea(cx, cy, cw, ch); + x -= cx; + 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)] ) + { + if ( [(wxNSView*)m_osxView trackingTag] ) + [m_osxView removeTrackingRect: [(wxNSView*)m_osxView trackingTag]]; + + [(wxNSView*)m_osxView setTrackingTag: [m_osxView addTrackingRect: [m_osxView bounds] owner: m_osxView userData: nil assumeInside: NO]]; + } } void wxWidgetCocoaImpl::GetPosition( int &x, int &y ) const @@ -959,8 +1257,8 @@ void wxWidgetCocoaImpl::GetPosition( int &x, int &y ) const void wxWidgetCocoaImpl::GetSize( int &width, int &height ) const { NSRect rect = [m_osxView frame]; - width = rect.size.width; - height = rect.size.height; + width = (int)rect.size.width; + height = (int)rect.size.height; } void wxWidgetCocoaImpl::GetContentArea( int&left, int &top, int &width, int &height ) const @@ -968,18 +1266,18 @@ void wxWidgetCocoaImpl::GetContentArea( int&left, int &top, int &width, int &hei if ( [m_osxView respondsToSelector:@selector(contentView) ] ) { NSView* cv = [m_osxView contentView]; - + NSRect bounds = [m_osxView bounds]; NSRect rect = [cv frame]; - - int y = rect.origin.y; - int x = rect.origin.x; + + int y = (int)rect.origin.y; + int x = (int)rect.origin.x; if ( ![ m_osxView isFlipped ] ) - y = bounds.size.height - (rect.origin.y + rect.size.height); + y = (int)(bounds.size.height - (rect.origin.y + rect.size.height)); left = x; top = y; - width = rect.size.width; - height = rect.size.height; + width = (int)rect.size.width; + height = (int)rect.size.height; } else { @@ -1008,15 +1306,16 @@ bool wxWidgetCocoaImpl::CanFocus() const bool wxWidgetCocoaImpl::HasFocus() const { - return ( [[m_osxView window] firstResponder] == m_osxView ); + return ( FindFocus() == m_osxView ); } -bool wxWidgetCocoaImpl::SetFocus() +bool wxWidgetCocoaImpl::SetFocus() { if ( [m_osxView canBecomeKeyView] == NO ) return false; - + [[m_osxView window] makeFirstResponder: m_osxView] ; + [[m_osxView window] makeKeyAndOrderFront:nil] ; return true; } @@ -1033,34 +1332,49 @@ void wxWidgetCocoaImpl::Embed( wxWidgetImpl *parent ) [container addSubview:m_osxView]; } -void wxWidgetCocoaImpl::SetBackgroundColour( const wxColour &WXUNUSED(col) ) +void wxWidgetCocoaImpl::SetBackgroundColour( const wxColour &col ) { - // m_osxView.backgroundColor = [[UIColor alloc] initWithCGColor:col.GetCGColor()]; + NSView* targetView = m_osxView; + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + targetView = [(NSScrollView*) m_osxView documentView]; + + if ( [targetView respondsToSelector:@selector(setBackgroundColor:) ] ) + { + [targetView setBackgroundColor:[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::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 , encoding ); + [m_osxView setStringValue:cf.AsNSString()]; + } } - + void wxWidgetImpl::Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to ) { NSPoint p = wxToNSPoint( from->GetWXWidget(), *pt ); - p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ]; + p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ]; *pt = wxFromNSPoint( to->GetWXWidget(), p ); } -wxInt32 wxWidgetCocoaImpl::GetValue() const +wxInt32 wxWidgetCocoaImpl::GetValue() const { return [(NSControl*)m_osxView intValue]; } -void wxWidgetCocoaImpl::SetValue( wxInt32 v ) +void wxWidgetCocoaImpl::SetValue( wxInt32 v ) { if ( [m_osxView respondsToSelector:@selector(setIntValue:)] ) { @@ -1076,7 +1390,7 @@ void wxWidgetCocoaImpl::SetValue( wxInt32 v ) } } -void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) +void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) { if ( [m_osxView respondsToSelector:@selector(setMinValue:)] ) { @@ -1084,7 +1398,7 @@ void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) } } -void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) +void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) { if ( [m_osxView respondsToSelector:@selector(setMaxValue:)] ) { @@ -1092,24 +1406,37 @@ void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) } } -wxInt32 wxWidgetCocoaImpl::GetMinimum() const +wxInt32 wxWidgetCocoaImpl::GetMinimum() const { if ( [m_osxView respondsToSelector:@selector(getMinValue:)] ) { - return [m_osxView minValue]; + return (int)[m_osxView minValue]; } return 0; } -wxInt32 wxWidgetCocoaImpl::GetMaximum() const +wxInt32 wxWidgetCocoaImpl::GetMaximum() const { if ( [m_osxView respondsToSelector:@selector(getMaxValue:)] ) { - return [m_osxView maxValue]; + return (int)[m_osxView maxValue]; } return 0; } +wxBitmap wxWidgetCocoaImpl::GetBitmap() const +{ + wxBitmap bmp; + + // TODO: how to create a wxBitmap from NSImage? +#if 0 + if ( [m_osxView respondsToSelector:@selector(image:)] ) + bmp = [m_osxView image]; +#endif + + return bmp; +} + void wxWidgetCocoaImpl::SetBitmap( const wxBitmap& bitmap ) { if ( [m_osxView respondsToSelector:@selector(setImage:)] ) @@ -1118,7 +1445,39 @@ void wxWidgetCocoaImpl::SetBitmap( const wxBitmap& bitmap ) } } -void wxWidgetCocoaImpl::SetupTabs( const wxNotebook& notebook) +void wxWidgetCocoaImpl::SetBitmapPosition( wxDirection dir ) +{ + if ( [m_osxView respondsToSelector:@selector(setImagePosition:)] ) + { + NSCellImagePosition pos; + switch ( dir ) + { + case wxLEFT: + pos = NSImageLeft; + break; + + case wxRIGHT: + pos = NSImageRight; + break; + + case wxTOP: + pos = NSImageAbove; + break; + + case wxBOTTOM: + pos = NSImageBelow; + break; + + default: + wxFAIL_MSG( "invalid image position" ); + pos = NSNoImage; + } + + [m_osxView setImagePosition:pos]; + } +} + +void wxWidgetCocoaImpl::SetupTabs( const wxNotebook& WXUNUSED(notebook)) { // implementation in subclass } @@ -1126,15 +1485,15 @@ 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]; [m_osxView sizeToFit]; NSRect best = [m_osxView frame]; [m_osxView setFrame:former]; - r->width = best.size.width; - r->height = best.size.height; + r->width = (int)best.size.width; + r->height = (int)best.size.height; } } @@ -1155,14 +1514,14 @@ void wxWidgetCocoaImpl::PulseGauge() { } -void wxWidgetCocoaImpl::SetScrollThumb( wxInt32 val, wxInt32 view ) +void wxWidgetCocoaImpl::SetScrollThumb( wxInt32 WXUNUSED(val), wxInt32 WXUNUSED(view) ) { } -void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) +void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) { NSControlSize size = NSRegularControlSize; - + switch ( variant ) { case wxWINDOW_VARIANT_NORMAL : @@ -1182,16 +1541,23 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) break ; default: - wxFAIL_MSG(_T("unexpected window variant")); + wxFAIL_MSG(wxT("unexpected window variant")); break ; } if ( [m_osxView respondsToSelector:@selector(setControlSize:)] ) [m_osxView setControlSize:size]; + else if ([m_osxView respondsToSelector:@selector(cell)]) + { + id cell = [(id)m_osxView cell]; + if ([cell respondsToSelector:@selector(setControlSize:)]) + [cell 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.OSXGetNSFont()]; } void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control ) @@ -1201,37 +1567,61 @@ void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control ) if ([c respondsToSelector:@selector(setAction:)]) { [c setTarget: c]; - [c setAction: @selector(clickedAction:)]; + [c setAction: @selector(controlAction:)]; if ([c respondsToSelector:@selector(setDoubleAction:)]) { - [c setDoubleAction: @selector(doubleClickedAction:)]; + [c setDoubleAction: @selector(controlDoubleAction:)]; } - + } } +bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text) +{ + wxKeyEvent wxevent(wxEVT_CHAR); + SetupKeyEvent( wxevent, event, text ); + + return GetWXPeer()->OSXHandleKeyEvent(wxevent); +} + bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event) { wxKeyEvent wxevent(wxEVT_KEY_DOWN); SetupKeyEvent( wxevent, event ); + bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent); - return GetWXPeer()->OSXHandleKeyEvent(wxevent); + // this will fire higher level events, like insertText, to help + // us handle EVT_CHAR, etc. + + if ( m_wxPeer->MacIsUserPane() && [event type] == NSKeyDown) + { + if ( !result ) + { + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]]; + else + [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]]; + result = true; + } + } + + return result; } bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event) { - NSPoint clickLocation; - clickLocation = [m_osxView convertPoint:[event locationInWindow] fromView:nil]; + NSPoint clickLocation; + clickLocation = [m_osxView convertPoint:[event locationInWindow] fromView:nil]; wxPoint pt = wxFromNSPoint( m_osxView, clickLocation ); wxMouseEvent wxevent(wxEVT_LEFT_DOWN); - SetupMouseEvent( wxevent , event ) ; + SetupMouseEvent(wxevent , event) ; 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() ) @@ -1241,7 +1631,7 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus) if ( receivedFocus ) { - wxLogTrace(_T("Focus"), _T("focus set(%p)"), static_cast(thisWindow)); + wxLogTrace(wxT("Focus"), wxT("focus set(%p)"), static_cast(thisWindow)); wxChildFocusEvent eventFocus((wxWindow*)thisWindow); thisWindow->HandleWindowEvent(eventFocus); @@ -1252,8 +1642,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 @@ -1263,12 +1653,12 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus) thisWindow->GetCaret()->OnKillFocus(); #endif - wxLogTrace(_T("Focus"), _T("focus lost(%p)"), static_cast(thisWindow)); - + wxLogTrace(wxT("Focus"), wxT("focus lost(%p)"), static_cast(thisWindow)); + 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) ; } } @@ -1305,8 +1695,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]; @@ -1314,16 +1705,17 @@ wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* pa // temporary hook for dnd [v registerForDraggedTypes:[NSArray arrayWithObjects: NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]]; - + wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v ); return c; } -wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now ) +wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now ) { NSWindow* tlw = now->GetWXWindow(); wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]]; wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( now, v, true ); + c->InstallEventHandler(); [tlw setContentView:v]; return c; }