X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1f1500304fa0780b37bef403def82b9463016c8..7c60222510bc5e197b12f153c4bf05db66cb0f4a:/src/osx/cocoa/window.mm?ds=inline diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 25cc1c2858..3465cdbc40 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 2008-06-20 -// RCS-ID: $Id: window.mm 48805 2007-09-19 14:52:25Z SC $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -13,14 +13,19 @@ #ifndef WX_PRECOMP #include "wx/dcclient.h" - #include "wx/nonownedwnd.h" + #include "wx/frame.h" #include "wx/log.h" + #include "wx/textctrl.h" + #include "wx/combobox.h" + #include "wx/radiobut.h" #endif #ifdef __WXMAC__ #include "wx/osx/private.h" #endif +#include "wx/evtloop.h" + #if wxUSE_CARET #include "wx/caret.h" #endif @@ -29,8 +34,60 @@ #include "wx/dnd.h" #endif +#if wxUSE_TOOLTIPS + #include "wx/tooltip.h" +#endif + #include +// Get the window with the focus + +NSView* wxOSXGetViewFromResponder( NSResponder* responder ) +{ + NSView* view = nil; + if ( [responder isKindOfClass:[NSTextView class]] ) + { + NSView* delegate = (NSView*) [(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 = wxOSXGetViewFromResponder([keyWindow firstResponder]); + + return focusedView; +} + +WXWidget wxWidgetImpl::FindFocus() +{ + return GetFocusedViewInWindow( [NSApp keyWindow] );; +} + +wxWidgetImpl* wxWidgetImpl::FindBestFromWXWidget(WXWidget control) +{ + wxWidgetImpl* impl = FindFromWXWidget(control); + + // NSScrollViews can have their subviews like NSClipView + // therefore check and use the NSScrollView peer in that case + if ( impl == NULL && [[control superview] isKindOfClass:[NSScrollView class]]) + impl = FindFromWXWidget([control superview]); + + return impl; +} + + NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin ) { int x, y, w, h ; @@ -44,13 +101,16 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const @interface wxNSView : NSView { + BOOL _hasToolTip; + NSTrackingRectTag _lastToolTipTrackTag; + id _lastToolTipOwner; + void* _lastUserData; + } -- (BOOL) canBecomeKeyView; - @end // wxNSView -@interface NSView(PossibleMethods) +@interface NSView(PossibleMethods) - (void)setTitle:(NSString *)aString; - (void)setStringValue:(NSString *)aString; - (void)setIntValue:(int)anInt; @@ -70,139 +130,403 @@ 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)setOpaque:(BOOL)opaque; +- (void)setTextColor:(NSColor *)color; +- (void)setImagePosition:(NSCellImagePosition)aPosition; +@end + +// The following code is a combination of the code listed here: +// http://lists.apple.com/archives/cocoa-dev/2008/Apr/msg01582.html +// (which can't be used because KLGetCurrentKeyboardLayout etc aren't 64-bit) +// and the code here: +// http://inquisitivecocoa.com/category/objective-c/ +@interface NSEvent (OsGuiUtilsAdditions) +- (NSString*) charactersIgnoringModifiersIncludingShift; +@end + +@implementation NSEvent (OsGuiUtilsAdditions) +- (NSString*) charactersIgnoringModifiersIncludingShift { + // First try -charactersIgnoringModifiers and look for keys which UCKeyTranslate translates + // differently than AppKit. + NSString* c = [self charactersIgnoringModifiers]; + if ([c length] == 1) { + unichar codepoint = [c characterAtIndex:0]; + if ((codepoint >= 0xF700 && codepoint <= 0xF8FF) || codepoint == 0x7F) { + return c; + } + } + // This is not a "special" key, so ask UCKeyTranslate to give us the character with no + // modifiers attached. Actually, that's not quite accurate; we attach the Command modifier + // which hints the OS to use Latin characters where possible, which is generally what we want. + NSString* result = @""; + TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource(); + CFDataRef uchr = (CFDataRef)TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData); + CFRelease(currentKeyboard); + if (uchr == NULL) { + // this can happen for some non-U.S. input methods (eg. Romaji or Hiragana) + return c; + } + const UCKeyboardLayout *keyboardLayout = (const UCKeyboardLayout*)CFDataGetBytePtr(uchr); + if (keyboardLayout) { + UInt32 deadKeyState = 0; + UniCharCount maxStringLength = 255; + UniCharCount actualStringLength = 0; + UniChar unicodeString[maxStringLength]; + + OSStatus status = UCKeyTranslate(keyboardLayout, + [self keyCode], + kUCKeyActionDown, + cmdKey >> 8, // force the Command key to "on" + LMGetKbdType(), + kUCKeyTranslateNoDeadKeysMask, + &deadKeyState, + maxStringLength, + &actualStringLength, + unicodeString); + + if(status == noErr) + result = [NSString stringWithCharacters:unicodeString length:(NSInteger)actualStringLength]; + } + return result; +} +@end -long wxOSXTranslateCocoaKey( int unichar ) +long wxOSXTranslateCocoaKey( NSEvent* event, int eventType ) { - long retval = unichar; - switch( unichar ) + long retval = 0; + + if ([event type] != NSFlagsChanged) { - 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; + NSString* s = [event charactersIgnoringModifiersIncludingShift]; + // backspace char reports as delete w/modifiers for some reason + if ([s length] == 1) + { + if ( eventType == wxEVT_CHAR && ([event modifierFlags] & NSControlKeyMask) && ( [s characterAtIndex:0] >= 'a' && [s characterAtIndex:0] <= 'z' ) ) + { + retval = WXK_CONTROL_A + ([s characterAtIndex:0] - 'a'); + } + else + { + 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 ); + else if ( intchar > 0 && intchar < 32 ) + retval = intchar; + 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] ) + { + // command key + case 54: + case 55: + retval = WXK_CONTROL; break; - case NSDeleteFunctionKey : - retval = WXK_DELETE; + // caps locks key + case 57: // Capslock + retval = WXK_CAPITAL; break; - case NSHomeFunctionKey : - retval = WXK_HOME; + // shift key + case 56: // Left Shift + case 60: // Right Shift + retval = WXK_SHIFT; break; -// case NSBeginFunctionKey : -// retval = WXK_BEGIN; -// break; - case NSEndFunctionKey : - retval = WXK_END; + // alt key + case 58: // Left Alt + case 61: // Right Alt + retval = WXK_ALT; break; - case NSPageUpFunctionKey : - retval = WXK_PAGEUP; + // ctrl key + case 59: // Left Ctrl + case 62: // Right Ctrl + retval = WXK_RAW_CONTROL; break; - case NSPageDownFunctionKey : - retval = WXK_PAGEDOWN; + // clear key + case 71: + retval = WXK_CLEAR; break; - case NSHelpFunctionKey : - retval = WXK_HELP; + // tab key + case 48: + retval = WXK_TAB; break; - - default : - if ( unichar >= NSF1FunctionKey && unichar >= NSF24FunctionKey ) - retval = WXK_F1 + (unichar - NSF1FunctionKey ); + default: break; } + + // Check for NUMPAD keys. For KEY_UP/DOWN events we need to use the + // WXK_NUMPAD constants, but for the CHAR event we want to use the + // standard ascii values + if ( eventType != wxEVT_CHAR ) + { + switch( [event keyCode] ) + { + case 75: // / + retval = WXK_NUMPAD_DIVIDE; + break; + case 67: // * + retval = WXK_NUMPAD_MULTIPLY; + break; + case 78: // - + retval = WXK_NUMPAD_SUBTRACT; + break; + case 69: // + + retval = WXK_NUMPAD_ADD; + break; + 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]; wxevent.m_shiftDown = modifiers & NSShiftKeyMask; - wxevent.m_controlDown = modifiers & NSControlKeyMask; + wxevent.m_rawControlDown = modifiers & NSControlKeyMask; wxevent.m_altDown = modifiers & NSAlternateKeyMask; - wxevent.m_metaDown = modifiers & NSCommandKeyMask; - + wxevent.m_controlDown = 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 = [[nsEvent charactersIgnoringModifiersIncludingShift] uppercaseString]; + if ( charString ) + { + // 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, wxevent.GetEventType()) ; + switch (eventType) { - wxCFStringRef cfchars((CFStringRef)[nschars retain]); - chars = cfchars.AsString(); + 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_RAW_CONTROL: + wxevent.SetEventType( wxevent.m_rawControlDown ? 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; + // OS X generates events with key codes in Unicode private use area for + // unprintable symbols such as cursor arrows (WXK_UP is mapped to U+F700) + // and function keys (WXK_F2 is U+F705). We don't want to use them as the + // result of wxKeyEvent::GetUnicodeKey() however as it's supposed to return + // WXK_NONE for "non characters" so explicitly exclude them. + // + // We only exclude the private use area inside the Basic Multilingual Plane + // as key codes beyond it don't seem to be currently used. + if ( !(aunichar >= 0xe000 && aunichar < 0xf900) ) + 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 ) +// better scroll wheel support +// see http://lists.apple.com/archives/cocoa-dev/2007/Feb/msg00050.html + +@interface NSEvent (DeviceDelta) +- (CGFloat)deviceDeltaX; +- (CGFloat)deviceDeltaY; + +// 10.7+ +- (BOOL)hasPreciseScrollingDeltas; +- (CGFloat)scrollingDeltaX; +- (CGFloat)scrollingDeltaY; +@end + +void wxWidgetCocoaImpl::SetupCoordinates(wxCoord &x, wxCoord &y, NSEvent* nsEvent) +{ + NSPoint locationInWindow = [nsEvent locationInWindow]; + + // adjust coordinates for the window of the target view + if ( [nsEvent window] != [m_osxView window] ) + { + if ( [nsEvent window] != nil ) + locationInWindow = [[nsEvent window] convertBaseToScreen:locationInWindow]; + + if ( [m_osxView window] != nil ) + locationInWindow = [[m_osxView window] convertScreenToBase:locationInWindow]; + } + + NSPoint locationInView = [m_osxView convertPoint:locationInWindow fromView:nil]; + wxPoint locationInViewWX = wxFromNSPoint( m_osxView, locationInView ); + + x = locationInViewWX.x; + y = locationInViewWX.y; + +} + +void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) { int eventType = [nsEvent type]; UInt32 modifiers = [nsEvent modifierFlags] ; - wxPoint screenMouseLocation = wxFromNSPoint( NULL, [nsEvent locationInWindow]); + + SetupCoordinates(wxevent.m_x, wxevent.m_y, nsEvent); // these parameters are not given for all events UInt32 button = [nsEvent buttonNumber]; UInt32 clickCount = 0; - if ( [nsEvent respondsToSelector:@selector(clickCount:)] ) - [nsEvent clickCount]; - wxevent.m_x = screenMouseLocation.x; - wxevent.m_y = screenMouseLocation.y; wxevent.m_shiftDown = modifiers & NSShiftKeyMask; - wxevent.m_controlDown = modifiers & NSControlKeyMask; + wxevent.m_rawControlDown = modifiers & NSControlKeyMask; wxevent.m_altDown = modifiers & NSAlternateKeyMask; - wxevent.m_metaDown = modifiers & NSCommandKeyMask; - wxevent.m_clickCount = clickCount; - wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ; + wxevent.m_controlDown = modifiers & NSCommandKeyMask; + wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ; - UInt32 mouseChord = 0; + UInt32 mouseChord = 0; switch (eventType) { @@ -272,6 +596,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) case NSLeftMouseDown : case NSRightMouseDown : case NSOtherMouseDown : + clickCount = [nsEvent clickCount]; switch ( button ) { case 0 : @@ -294,6 +619,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) case NSLeftMouseUp : case NSRightMouseUp : case NSOtherMouseUp : + clickCount = [nsEvent clickCount]; switch ( button ) { case 0 : @@ -315,19 +641,60 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) case NSScrollWheel : { + float deltaX = 0.0; + float deltaY = 0.0; + wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ; + + if ( UMAGetSystemVersion() >= 0x1070 ) + { + if ( [nsEvent hasPreciseScrollingDeltas] ) + { + deltaX = [nsEvent scrollingDeltaX]; + deltaY = [nsEvent scrollingDeltaY]; + } + else + { + deltaX = [nsEvent scrollingDeltaX] * 10; + deltaY = [nsEvent scrollingDeltaY] * 10; + } + } + else + { + const EventRef cEvent = (EventRef) [nsEvent eventRef]; + // see http://developer.apple.com/qa/qa2005/qa1453.html + // for more details on why we have to look for the exact type + + 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; - NSLog(@"deltaX %f, deltaY %f",[nsEvent deltaX], [nsEvent deltaY]); - if ( abs([nsEvent deltaX]) > abs([nsEvent deltaY]) ) + wxevent.m_columnsPerAction = 1; + + if ( fabs(deltaX) > fabs(deltaY) ) { - wxevent.m_wheelAxis = 1; - wxevent.m_wheelRotation = [nsEvent deltaX] * 10.0; + wxevent.m_wheelAxis = wxMOUSE_WHEEL_HORIZONTAL; + wxevent.m_wheelRotation = (int)deltaX; } else { - wxevent.m_wheelRotation = [nsEvent deltaY] * 10.0; + wxevent.m_wheelRotation = (int)deltaY; } + } break ; @@ -346,6 +713,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 @@ -353,17 +728,109 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) + (void)initialize { static BOOL initialized = NO; - if (!initialized) + if (!initialized) { initialized = YES; wxOSXCocoaClassAddWXMethods( self ); } } -- (BOOL) canBecomeKeyView +/* idea taken from webkit sources: overwrite the methods that (private) NSToolTipManager will use to attach its tracking rectangle + * then when changing the tooltip send fake view-exit and view-enter methods which will lead to a tooltip refresh + */ + + +- (void)_sendToolTipMouseExited +{ + // Nothing matters except window, trackingNumber, and userData. + NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseExited + location:NSMakePoint(0, 0) + modifierFlags:0 + timestamp:0 + windowNumber:[[self window] windowNumber] + context:NULL + eventNumber:0 + trackingNumber:_lastToolTipTrackTag + userData:_lastUserData]; + [_lastToolTipOwner mouseExited:fakeEvent]; +} + +- (void)_sendToolTipMouseEntered +{ + // Nothing matters except window, trackingNumber, and userData. + NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseEntered + location:NSMakePoint(0, 0) + modifierFlags:0 + timestamp:0 + windowNumber:[[self window] windowNumber] + context:NULL + eventNumber:0 + trackingNumber:_lastToolTipTrackTag + userData:_lastUserData]; + [_lastToolTipOwner mouseEntered:fakeEvent]; +} + +- (void)setToolTip:(NSString *)string; +{ + if (string) + { + if ( _hasToolTip ) + { + [self _sendToolTipMouseExited]; + } + + [super setToolTip:string]; + _hasToolTip = YES; + [self _sendToolTipMouseEntered]; + } + else + { + if ( _hasToolTip ) + { + [self _sendToolTipMouseExited]; + [super setToolTip:nil]; + _hasToolTip = NO; + } + } +} + +- (NSTrackingRectTag)addTrackingRect:(NSRect)rect owner:(id)owner userData:(void *)data assumeInside:(BOOL)assumeInside +{ + NSTrackingRectTag tag = [super addTrackingRect:rect owner:owner userData:data assumeInside:assumeInside]; + if ( owner != self ) + { + _lastUserData = data; + _lastToolTipOwner = owner; + _lastToolTipTrackTag = tag; + } + return tag; +} + +- (void)removeTrackingRect:(NSTrackingRectTag)tag +{ + if (tag == _lastToolTipTrackTag) + { + _lastUserData = NULL; + _lastToolTipOwner = nil; + _lastToolTipTrackTag = 0; + } + [super removeTrackingRect:tag]; +} + +#if wxOSX_USE_NATIVE_FLIPPED +- (BOOL)isFlipped { return YES; } +#endif + +- (BOOL) canBecomeKeyView +{ + wxWidgetCocoaImpl* viewimpl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); + if ( viewimpl && viewimpl->IsUserPane() && viewimpl->GetWXPeer() ) + return viewimpl->GetWXPeer()->AcceptsFocus(); + return NO; +} @end // wxNSView @@ -381,7 +848,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); } @@ -390,7 +857,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); } @@ -399,7 +866,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); } @@ -408,79 +875,152 @@ 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_cursorUpdate(NSView* self, SEL _cmd, NSEvent *event) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + + impl->cursorUpdate(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 ); + 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_becomeFirstResponder(NSView* self, SEL _cmd) +BOOL wxOSX_acceptsFirstResponder(NSView* self, SEL _cmd) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NO; - - return impl->becomeFirstResponder(self, _cmd); + + return impl->acceptsFirstResponder(self, _cmd); } -BOOL wxOSX_resignFirstResponder(NSView* self, SEL _cmd) +BOOL wxOSX_becomeFirstResponder(NSView* self, SEL _cmd) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NO; - - return impl->resignFirstResponder(self, _cmd); + + return impl->becomeFirstResponder(self, _cmd); } -void wxOSX_resetCursorRects(NSView* self, SEL _cmd) +BOOL wxOSX_resignFirstResponder(NSView* self, SEL _cmd) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) - return; - - impl->resetCursorRects(self, _cmd); + return NO; + + return impl->resignFirstResponder(self, _cmd); } +#if !wxOSX_USE_NATIVE_FLIPPED + 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; } +#endif + +typedef void (*wxOSX_DrawRectHandlerPtr)(NSView* self, SEL _cmd, NSRect rect); + void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect) { wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + +#if wxUSE_THREADS + // OS X starts a NSUIHeartBeatThread for animating the default button in a + // dialog. This causes a drawRect of the active dialog from outside the + // main UI thread. This causes an occasional crash since the wx drawing + // objects (like wxPen) are not thread safe. + // + // Notice that NSUIHeartBeatThread seems to be undocumented and doing + // [NSWindow setAllowsConcurrentViewDrawing:NO] does not affect it. + if ( !wxThread::IsMain() ) + { + if ( impl->IsUserPane() ) + { + wxWindow* win = impl->GetWXPeer(); + if ( win->UseBgCol() ) + { + + CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort]; + CGContextSaveGState( context ); + + CGContextSetFillColorWithColor( context, win->GetBackgroundColour().GetCGColor()); + CGRect r = CGRectMake(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); + CGContextFillRect( context, r ); + + CGContextRestoreGState( context ); + } + } + else + { + // just call the superclass handler, we don't need any custom wx drawing + // here and it seems to work fine: + wxOSX_DrawRectHandlerPtr + superimpl = (wxOSX_DrawRectHandlerPtr) + [[self superclass] instanceMethodForSelector:_cmd]; + superimpl(self, _cmd, rect); + } + + return; + } +#endif // wxUSE_THREADS + return impl->drawRect(&rect, self, _cmd); } @@ -489,7 +1029,7 @@ void wxOSX_controlAction(NSView* self, SEL _cmd, id sender) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + impl->controlAction(self, _cmd, sender); } @@ -498,26 +1038,27 @@ void wxOSX_controlDoubleAction(NSView* self, SEL _cmd, id sender) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + 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; @@ -526,12 +1067,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 ) { @@ -547,42 +1088,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; @@ -590,13 +1132,13 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget slf, void *_cm result = wxDragCopy; 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 ) { @@ -612,17 +1154,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; @@ -631,58 +1174,182 @@ 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_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); - void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd) { - if ( !DoHandleMouseEvent(event) ) + // we are getting moved events for all windows in the hierarchy, not something wx expects + // therefore we only handle it for the deepest child in the hierarchy + if ( [event type] == NSMouseMoved ) { - wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; - superimpl(slf, (SEL)_cmd, event); + NSView* hitview = [[[slf window] contentView] hitTest:[event locationInWindow]]; + if ( hitview == NULL || hitview != slf) + return; } -} - + + if ( !DoHandleMouseEvent(event) ) + { + // for plain NSView mouse events would propagate to parents otherwise + // scrollwheel events have to be propagated if not handled in all cases + if (!IsUserPane() || [event type] == NSScrollWheel ) + { + wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; + superimpl(slf, (SEL)_cmd, event); + + // super of built-ins keeps the mouse up, as wx expects this event, we have to synthesize it + // only trigger if at this moment the mouse is already up + if ( [ event type] == NSLeftMouseDown && !wxGetMouseState().LeftIsDown() ) + { + wxMouseEvent wxevent(wxEVT_LEFT_DOWN); + SetupMouseEvent(wxevent , event) ; + wxevent.SetEventType(wxEVT_LEFT_UP); + + GetWXPeer()->HandleWindowEvent(wxevent); + } + } + } +} + +void wxWidgetCocoaImpl::cursorUpdate(WX_NSEvent event, WXWidget slf, void *_cmd) +{ + if ( !SetupCursor(event) ) + { + wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; + superimpl(slf, (SEL)_cmd, event); + } + } + +bool wxWidgetCocoaImpl::SetupCursor(WX_NSEvent event) +{ + extern wxCursor gGlobalCursor; + + if ( gGlobalCursor.IsOk() ) + { + gGlobalCursor.MacInstall(); + return true; + } + else + { + wxWindow* cursorTarget = GetWXPeer(); + wxCoord x,y; + SetupCoordinates(x, y, event); + wxPoint cursorPoint( x , y ) ; + + while ( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) ) + { + // at least in GTK cursor events are not propagated either ... +#if 1 + cursorTarget = NULL; +#else + cursorTarget = cursorTarget->GetParent() ; + if ( cursorTarget ) + cursorPoint += cursorTarget->GetPosition(); +#endif + } + + return cursorTarget != NULL; + } +} + void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd) { - if ( !DoHandleKeyEvent(event) ) + if ( [event type] == NSKeyDown ) + { + // there are key equivalents that are not command-combos and therefore not handled by cocoa automatically, + // therefore we call the menubar directly here, exit if the menu is handling the shortcut + if ( [[[NSApplication sharedApplication] mainMenu] performKeyEquivalent:event] ) + return; + + 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; } +void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd) +{ + if ( m_lastKeyDownEvent==NULL || m_hasEditor || !DoHandleCharEvent(m_lastKeyDownEvent, text) ) + { + 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) { - if ( !DoHandleKeyEvent(event) ) + bool handled = false; + + wxKeyEvent wxevent(wxEVT_KEY_DOWN); + SetupKeyEvent( wxevent, event ); + + // because performKeyEquivalent is going up the entire view hierarchy, we don't have to + // walk up the ancestors ourselves but let cocoa do it + + int command = m_wxPeer->GetAcceleratorTable()->GetCommand( wxevent ); + if (command != -1) + { + wxEvtHandler * const handler = m_wxPeer->GetEventHandler(); + + wxCommandEvent command_event( wxEVT_MENU, command ); + command_event.SetEventObject( wxevent.GetEventObject() ); + handled = handler->ProcessEvent( command_event ); + + if ( !handled ) + { + // accelerators can also be used with buttons, try them too + command_event.SetEventType(wxEVT_BUTTON); + handled = handler->ProcessEvent( command_event ); + } + } + + if ( !handled ) { 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 ( IsUserPane() ) + 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; } @@ -690,47 +1357,99 @@ 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 ); - return r; -} + + NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder(); + NSView* otherView = wxOSXGetViewFromResponder(responder); -void wxWidgetCocoaImpl::resetCursorRects(WXWidget slf, void *_cmd) -{ - wxWindow* wxpeer = GetWXPeer(); - if ( wxpeer ) + wxWidgetImpl* otherWindow = FindBestFromWXWidget(otherView); + + // It doesn't make sense to notify about the loss of focus if it's the same + // control in the end, and just a different subview + if ( otherWindow == this ) + return 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 then + if ( r && !m_hasEditor) { - NSCursor *cursor = (NSCursor*)wxpeer->GetCursor().GetHCURSOR(); - if (cursor == NULL) - { - wxOSX_ResetCursorRectsHandlerPtr superimpl = (wxOSX_ResetCursorRectsHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; - superimpl(slf, (SEL)_cmd); - } - else - { - [slf addCursorRect: [slf bounds] - cursor: cursor]; - } + DoNotifyFocusEvent( false, otherWindow ); } + return r; } - -bool wxWidgetCocoaImpl::isFlipped(WXWidget slf, void *_cmd) + +#if !wxOSX_USE_NATIVE_FLIPPED + +bool wxWidgetCocoaImpl::isFlipped(WXWidget slf, void *WXUNUSED(_cmd)) { return m_isFlipped; } +#endif #define OSX_DEBUG_DRAWING 0 -void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd) +void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd)) { + // preparing the update region + + wxRegion updateRgn; + + // since adding many rects to a region is a costly process, by default use the bounding rect +#if 0 + const NSRect *rects; + NSInteger count; + [slf getRectsBeingDrawn:&rects count:&count]; + for ( int i = 0 ; i < count ; ++i ) + { + updateRgn.Union(wxFromNSRect(slf, rects[i])); + } +#else + updateRgn.Union(wxFromNSRect(slf,*(NSRect*)rect)); +#endif + + wxWindow* wxpeer = GetWXPeer(); + + if ( wxpeer->MacGetLeftBorderSize() != 0 || wxpeer->MacGetTopBorderSize() != 0 ) + { + // as this update region is in native window locals we must adapt it to wx window local + updateRgn.Offset( wxpeer->MacGetLeftBorderSize() , wxpeer->MacGetTopBorderSize() ); + } + + // Restrict the update region to the shape of the window, if any, and also + // remember the region that we need to clear later. + wxNonOwnedWindow* const tlwParent = wxpeer->MacGetTopLevelWindow(); + const bool isTopLevel = tlwParent == wxpeer; + wxRegion clearRgn; + if ( tlwParent->GetWindowStyle() & wxFRAME_SHAPED ) + { + if ( isTopLevel ) + clearRgn = updateRgn; + + int xoffset = 0, yoffset = 0; + wxRegion rgn = tlwParent->GetShape(); + wxpeer->MacRootWindowToWindow( &xoffset, &yoffset ); + rgn.Offset( xoffset, yoffset ); + updateRgn.Intersect(rgn); + + if ( isTopLevel ) + { + // Exclude the window shape from the region to be cleared below. + rgn.Xor(wxpeer->GetSize()); + clearRgn.Intersect(rgn); + } + } + + wxpeer->GetUpdateRegion() = updateRgn; + + // setting up the drawing context + CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort]; CGContextSaveGState( context ); #if OSX_DEBUG_DRAWING CGContextBeginPath( context ); CGContextMoveToPoint(context, 0, 0); - NSRect bounds = [self bounds]; + NSRect bounds = [slf bounds]; CGContextAddLineToPoint(context, 10, 0); CGContextMoveToPoint(context, 0, 0); CGContextAddLineToPoint(context, 0, 10); @@ -741,29 +1460,16 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd) CGContextClosePath( context ); CGContextStrokePath(context); #endif - - if ( !m_isFlipped ) + + if ( ![slf isFlipped] ) { CGContextTranslateCTM( context, 0, [m_osxView bounds].size.height ); CGContextScaleCTM( context, 1, -1 ); } - wxRegion updateRgn; - const NSRect *rects; - NSInteger count; - - [slf getRectsBeingDrawn:&rects count:&count]; - for ( int i = 0 ; i < count ; ++i ) - { - updateRgn.Union(wxFromNSRect(slf, rects[i]) ); - } - - wxWindow* wxpeer = GetWXPeer(); - wxpeer->GetUpdateRegion() = updateRgn; wxpeer->MacSetCGContextRef( context ); - + bool handled = wxpeer->MacDoRedraw( 0 ); - CGContextRestoreGState( context ); CGContextSaveGState( context ); @@ -776,23 +1482,80 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *_cmd) CGContextRestoreGState( context ); CGContextSaveGState( context ); } + // as we called restore above, we have to flip again if necessary + if ( ![slf isFlipped] ) + { + CGContextTranslateCTM( context, 0, [m_osxView bounds].size.height ); + CGContextScaleCTM( context, 1, -1 ); + } + + if ( isTopLevel ) + { + // We also need to explicitly draw the part of the top level window + // outside of its region with transparent colour to ensure that it is + // really transparent. + if ( clearRgn.IsOk() ) + { + wxMacCGContextStateSaver saveState(context); + wxWindowDC dc(wxpeer); + dc.SetBackground(wxBrush(wxTransparentColour)); + dc.SetDeviceClippingRegion(clearRgn); + dc.Clear(); + } + +#if wxUSE_GRAPHICS_CONTEXT + // If the window shape is defined by a path, stroke the path to show + // the window border. + const wxGraphicsPath& path = tlwParent->GetShapePath(); + if ( !path.IsNull() ) + { + CGContextSetLineWidth(context, 1); + CGContextSetStrokeColorWithColor(context, wxLIGHT_GREY->GetCGColor()); + CGContextAddPath(context, (CGPathRef) path.GetNativePath()); + CGContextStrokePath(context); + } +#endif // wxUSE_GRAPHICS_CONTEXT + } + wxpeer->MacPaintChildrenBorders(); wxpeer->MacSetCGContextRef( NULL ); 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->OSXSimulateFocusEvents(); wxpeer->OSXHandleClicked(0); + } +} + +void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender)) +{ } -void wxWidgetCocoaImpl::controlDoubleAction( WXWidget slf, void *_cmd, void *sender) +void wxWidgetCocoaImpl::controlTextDidChange() { + wxWindow* wxpeer = (wxWindow*)GetWXPeer(); + if ( wxpeer ) + { + // since native rtti doesn't have to be enabled and wx' rtti is not aware of the mixin wxTextEntry, workaround is needed + wxTextCtrl *tc = wxDynamicCast( wxpeer , wxTextCtrl ); + wxComboBox *cb = wxDynamicCast( wxpeer , wxComboBox ); + if ( tc ) + tc->SendTextUpdatedEventIfAllowed(); + else if ( cb ) + cb->SendTextUpdatedEventIfAllowed(); + else + { + wxFAIL_MSG("Unexpected class for controlTextDidChange event"); + } + } } -// +// #if OBJC_API_VERSION >= 2 @@ -802,7 +1565,7 @@ void wxWidgetCocoaImpl::controlDoubleAction( WXWidget slf, void *_cmd, void *sen #else #define wxOSX_CLASS_ADD_METHOD( c, s, i, t ) \ - { s, t, i }, + { s, (char*) t, i }, #endif @@ -827,23 +1590,30 @@ 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@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(mouseExited:), (IMP) wxOSX_mouseEvent, "v@:@" ) - + + wxOSX_CLASS_ADD_METHOD(c, @selector(cursorUpdate:), (IMP) wxOSX_cursorUpdate, "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@:" ) +#if !wxOSX_USE_NATIVE_FLIPPED wxOSX_CLASS_ADD_METHOD(c, @selector(isFlipped), (IMP) wxOSX_isFlipped, "c@:" ) +#endif wxOSX_CLASS_ADD_METHOD(c, @selector(drawRect:), (IMP) wxOSX_drawRect, "v@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}" ) wxOSX_CLASS_ADD_METHOD(c, @selector(controlAction:), (IMP) wxOSX_controlAction, "v@:@" ) @@ -854,8 +1624,8 @@ void wxOSXCocoaClassAddWXMethods(Class c) 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 ); @@ -877,14 +1647,23 @@ void wxOSXCocoaClassAddWXMethods(Class c) IMPLEMENT_DYNAMIC_CLASS( wxWidgetCocoaImpl , wxWidgetImpl ) -wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl ) : - wxWidgetImpl( peer, isRootControl ) +wxWidgetCocoaImpl::wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl, bool isUserPane ) : + wxWidgetImpl( peer, isRootControl, isUserPane ) { 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(); } @@ -892,7 +1671,11 @@ wxWidgetCocoaImpl::wxWidgetCocoaImpl() void wxWidgetCocoaImpl::Init() { m_osxView = NULL; +#if !wxOSX_USE_NATIVE_FLIPPED m_isFlipped = true; +#endif + m_lastKeyDownEvent = NULL; + m_hasEditor = false; } wxWidgetCocoaImpl::~wxWidgetCocoaImpl() @@ -905,10 +1688,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; } @@ -918,15 +1703,377 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible ) [m_osxView setHidden:(visible ? NO:YES)]; } -void wxWidgetCocoaImpl::Raise() +double wxWidgetCocoaImpl::GetContentScaleFactor() const +{ +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 + NSWindow* tlw = [m_osxView window]; + if ( [ tlw respondsToSelector:@selector(backingScaleFactor) ] ) + return [tlw backingScaleFactor]; + else +#endif + return 1.0; +} + +// ---------------------------------------------------------------------------- +// window animation stuff +// ---------------------------------------------------------------------------- + +// define a delegate used to refresh the window during animation +@interface wxNSAnimationDelegate : NSObject wxOSX_10_6_AND_LATER() { + wxWindow *m_win; + bool m_isDone; } + +- (id)init:(wxWindow *)win; + +- (bool)isDone; + +// NSAnimationDelegate methods +- (void)animationDidEnd:(NSAnimation*)animation; +- (void)animation:(NSAnimation*)animation + didReachProgressMark:(NSAnimationProgress)progress; +@end + +@implementation wxNSAnimationDelegate + +- (id)init:(wxWindow *)win +{ + self = [super init]; + + m_win = win; + m_isDone = false; + + return self; +} + +- (bool)isDone +{ + return m_isDone; +} + +- (void)animation:(NSAnimation*)animation + didReachProgressMark:(NSAnimationProgress)progress +{ + wxUnusedVar(animation); + wxUnusedVar(progress); + + m_win->SendSizeEvent(); +} + +- (void)animationDidEnd:(NSAnimation*)animation +{ + wxUnusedVar(animation); + m_isDone = true; +} + +@end + +/* static */ +bool +wxWidgetCocoaImpl::ShowViewOrWindowWithEffect(wxWindow *win, + bool show, + wxShowEffect effect, + unsigned timeout) +{ + // create the dictionary describing the animation to perform on this view + NSObject * const + viewOrWin = static_cast(win->OSXGetViewOrWindow()); + NSMutableDictionary * const + dict = [NSMutableDictionary dictionaryWithCapacity:4]; + [dict setObject:viewOrWin forKey:NSViewAnimationTargetKey]; + + // determine the start and end rectangles assuming we're hiding the window + const wxRect rectOrig = win->GetRect(); + wxRect rectStart, + rectEnd; + rectStart = + rectEnd = rectOrig; + + if ( show ) + { + if ( effect == wxSHOW_EFFECT_ROLL_TO_LEFT || + effect == wxSHOW_EFFECT_SLIDE_TO_LEFT ) + effect = wxSHOW_EFFECT_ROLL_TO_RIGHT; + else if ( effect == wxSHOW_EFFECT_ROLL_TO_RIGHT || + effect == wxSHOW_EFFECT_SLIDE_TO_RIGHT ) + effect = wxSHOW_EFFECT_ROLL_TO_LEFT; + else if ( effect == wxSHOW_EFFECT_ROLL_TO_TOP || + effect == wxSHOW_EFFECT_SLIDE_TO_TOP ) + effect = wxSHOW_EFFECT_ROLL_TO_BOTTOM; + else if ( effect == wxSHOW_EFFECT_ROLL_TO_BOTTOM || + effect == wxSHOW_EFFECT_SLIDE_TO_BOTTOM ) + effect = wxSHOW_EFFECT_ROLL_TO_TOP; + } + + switch ( effect ) + { + case wxSHOW_EFFECT_ROLL_TO_LEFT: + case wxSHOW_EFFECT_SLIDE_TO_LEFT: + rectEnd.width = 0; + break; + + case wxSHOW_EFFECT_ROLL_TO_RIGHT: + case wxSHOW_EFFECT_SLIDE_TO_RIGHT: + rectEnd.x = rectStart.GetRight(); + rectEnd.width = 0; + break; + + case wxSHOW_EFFECT_ROLL_TO_TOP: + case wxSHOW_EFFECT_SLIDE_TO_TOP: + rectEnd.height = 0; + break; + + case wxSHOW_EFFECT_ROLL_TO_BOTTOM: + case wxSHOW_EFFECT_SLIDE_TO_BOTTOM: + rectEnd.y = rectStart.GetBottom(); + rectEnd.height = 0; + break; + + case wxSHOW_EFFECT_EXPAND: + rectEnd.x = rectStart.x + rectStart.width / 2; + rectEnd.y = rectStart.y + rectStart.height / 2; + rectEnd.width = + rectEnd.height = 0; + break; + + case wxSHOW_EFFECT_BLEND: + [dict setObject:(show ? NSViewAnimationFadeInEffect + : NSViewAnimationFadeOutEffect) + forKey:NSViewAnimationEffectKey]; + break; + + case wxSHOW_EFFECT_NONE: + case wxSHOW_EFFECT_MAX: + wxFAIL_MSG( "unexpected animation effect" ); + return false; + + default: + wxFAIL_MSG( "unknown animation effect" ); + return false; + }; + + if ( show ) + { + // we need to restore it to the original rectangle instead of making it + // disappear + wxSwap(rectStart, rectEnd); + + // and as the window is currently hidden, we need to show it for the + // animation to be visible at all (but don't restore it at its full + // rectangle as it shouldn't appear immediately) + win->SetSize(rectStart); + win->Show(); + } + + NSView * const parentView = [viewOrWin isKindOfClass:[NSView class]] + ? [(NSView *)viewOrWin superview] + : nil; + const NSRect rStart = wxToNSRect(parentView, rectStart); + const NSRect rEnd = wxToNSRect(parentView, rectEnd); + + [dict setObject:[NSValue valueWithRect:rStart] + forKey:NSViewAnimationStartFrameKey]; + [dict setObject:[NSValue valueWithRect:rEnd] + forKey:NSViewAnimationEndFrameKey]; + + // create an animation using the values in the above dictionary + NSViewAnimation * const + anim = [[NSViewAnimation alloc] + initWithViewAnimations:[NSArray arrayWithObject:dict]]; + + if ( !timeout ) + { + // what is a good default duration? Windows uses 200ms, Web frameworks + // use anything from 250ms to 1s... choose something in the middle + timeout = 500; + } + + [anim setDuration:timeout/1000.]; // duration is in seconds here + + // if the window being animated changes its layout depending on its size + // (which is almost always the case) we need to redo it during animation + // + // the number of layouts here is arbitrary, but 10 seems like too few (e.g. + // controls in wxInfoBar visibly jump around) + const int NUM_LAYOUTS = 20; + for ( float f = 1./NUM_LAYOUTS; f < 1.; f += 1./NUM_LAYOUTS ) + [anim addProgressMark:f]; + + wxNSAnimationDelegate * const + animDelegate = [[wxNSAnimationDelegate alloc] init:win]; + [anim setDelegate:animDelegate]; + [anim startAnimation]; + + // Cocoa is capable of doing animation asynchronously or even from separate + // thread but wx API doesn't provide any way to be notified about the + // animation end and without this we really must ensure that the window has + // the expected (i.e. the same as if a simple Show() had been used) size + // when we return, so block here until the animation finishes + // + // notice that because the default animation mode is NSAnimationBlocking, + // no user input events ought to be processed from here + { + wxEventLoopGuarantor ensureEventLoopExistence; + wxEventLoopBase * const loop = wxEventLoopBase::GetActive(); + while ( ![animDelegate isDone] ) + loop->Dispatch(); + } + + if ( !show ) + { + // NSViewAnimation is smart enough to hide the NSView being animated at + // the end but we also must ensure that it's hidden for wx too + win->Hide(); + + // and we must also restore its size because it isn't expected to + // change just because the window was hidden + win->SetSize(rectOrig); + } + else + { + // refresh it once again after the end to ensure that everything is in + // place + win->SendSizeEvent(); + } + + [anim setDelegate:nil]; + [animDelegate release]; + [anim release]; + + return true; +} + +bool wxWidgetCocoaImpl::ShowWithEffect(bool show, + wxShowEffect effect, + unsigned timeout) +{ + return ShowViewOrWindowWithEffect(m_wxPeer, show, effect, timeout); +} + +/* note that the drawing order between siblings is not defined under 10.4 */ +/* only starting from 10.5 the subview order is respected */ + +/* NSComparisonResult is typedef'd as an enum pre-Leopard but typedef'd as + * NSInteger post-Leopard. Pre-Leopard the Cocoa toolkit expects a function + * returning int and not NSComparisonResult. Post-Leopard the Cocoa toolkit + * expects a function returning the new non-enum NSComparsionResult. + * Hence we create a typedef named CocoaWindowCompareFunctionResult. + */ +#if defined(NSINTEGER_DEFINED) +typedef NSComparisonResult CocoaWindowCompareFunctionResult; +#else +typedef int CocoaWindowCompareFunctionResult; +#endif + +class CocoaWindowCompareContext +{ + wxDECLARE_NO_COPY_CLASS(CocoaWindowCompareContext); +public: + CocoaWindowCompareContext(); // Not implemented + CocoaWindowCompareContext(NSView *target, NSArray *subviews) + { + m_target = target; + // Cocoa sorts subviews in-place.. make a copy + m_subviews = [subviews copy]; + } + + ~CocoaWindowCompareContext() + { // release the copy + [m_subviews release]; + } + NSView* target() + { return m_target; } + + NSArray* subviews() + { return m_subviews; } + /* Helper function that returns the comparison based off of the original ordering */ + CocoaWindowCompareFunctionResult CompareUsingOriginalOrdering(id first, id second) + { + NSUInteger firstI = [m_subviews indexOfObjectIdenticalTo:first]; + NSUInteger secondI = [m_subviews indexOfObjectIdenticalTo:second]; + // NOTE: If either firstI or secondI is NSNotFound then it will be NSIntegerMax and thus will + // likely compare higher than the other view which is reasonable considering the only way that + // can happen is if the subview was added after our call to subviews but before the call to + // sortSubviewsUsingFunction:context:. Thus we don't bother checking. Particularly because + // that case should never occur anyway because that would imply a multi-threaded GUI call + // which is a big no-no with Cocoa. + + // Subviews are ordered from back to front meaning one that is already lower will have an lower index. + NSComparisonResult result = (firstI < secondI) + ? NSOrderedAscending /* -1 */ + : (firstI > secondI) + ? NSOrderedDescending /* 1 */ + : NSOrderedSame /* 0 */; + + return result; + } +private: + /* The subview we are trying to Raise or Lower */ + NSView *m_target; + /* A copy of the original array of subviews */ + NSArray *m_subviews; +}; + +/* Causes Cocoa to raise the target view to the top of the Z-Order by telling the sort function that + * the target view is always higher than every other view. When comparing two views neither of + * which is the target, it returns the correct response based on the original ordering + */ +static CocoaWindowCompareFunctionResult CocoaRaiseWindowCompareFunction(id first, id second, void *ctx) +{ + CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx; + // first should be ordered higher + if(first==compareContext->target()) + return NSOrderedDescending; + // second should be ordered higher + if(second==compareContext->target()) + return NSOrderedAscending; + return compareContext->CompareUsingOriginalOrdering(first,second); +} + +void wxWidgetCocoaImpl::Raise() +{ + NSView* nsview = m_osxView; + + NSView *superview = [nsview superview]; + CocoaWindowCompareContext compareContext(nsview, [superview subviews]); + + [superview sortSubviewsUsingFunction: + CocoaRaiseWindowCompareFunction + context: &compareContext]; + +} + +/* Causes Cocoa to lower the target view to the bottom of the Z-Order by telling the sort function that + * the target view is always lower than every other view. When comparing two views neither of + * which is the target, it returns the correct response based on the original ordering + */ +static CocoaWindowCompareFunctionResult CocoaLowerWindowCompareFunction(id first, id second, void *ctx) +{ + CocoaWindowCompareContext *compareContext = (CocoaWindowCompareContext*)ctx; + // first should be ordered lower + if(first==compareContext->target()) + return NSOrderedAscending; + // second should be ordered lower + if(second==compareContext->target()) + return NSOrderedDescending; + return compareContext->CompareUsingOriginalOrdering(first,second); +} + void wxWidgetCocoaImpl::Lower() { + NSView* nsview = m_osxView; + + NSView *superview = [nsview superview]; + CocoaWindowCompareContext compareContext(nsview, [superview subviews]); + + [superview sortSubviewsUsingFunction: + CocoaLowerWindowCompareFunction + context: &compareContext]; } -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() ; @@ -945,9 +2092,9 @@ 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() ) { int cx = 0,cy = 0,cw = 0,ch = 0; if ( parent->GetPeer() ) @@ -957,8 +2104,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]; } void wxWidgetCocoaImpl::GetPosition( int &x, int &y ) const @@ -966,13 +2115,27 @@ void wxWidgetCocoaImpl::GetPosition( int &x, int &y ) const wxRect r = wxFromNSRect( [m_osxView superview], [m_osxView frame] ); x = r.GetLeft(); y = r.GetTop(); + + // under Cocoa we might have a contentView in the wxParent to which we have to + // adjust the coordinates + wxWindowMac* parent = GetWXPeer()->GetParent(); + if (parent && [m_osxView superview] != parent->GetHandle() ) + { + int cx = 0,cy = 0,cw = 0,ch = 0; + if ( parent->GetPeer() ) + { + parent->GetPeer()->GetContentArea(cx, cy, cw, ch); + x += cx; + y += cy; + } + } } 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 @@ -980,18 +2143,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 { @@ -1020,18 +2183,41 @@ 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 ) + if ( !CanFocus() ) return false; - + + // TODO remove if no issues arise: should not raise the window, only assign focus + //[[m_osxView window] makeKeyAndOrderFront:nil] ; [[m_osxView window] makeFirstResponder: m_osxView] ; return true; } +void wxWidgetCocoaImpl::SetDropTarget(wxDropTarget* target) +{ + [m_osxView unregisterDraggedTypes]; + + if ( target == NULL ) + return; + + wxDataObject* dobj = target->GetDataObject(); + + if( dobj ) + { + CFMutableArrayRef typesarray = CFArrayCreateMutable(kCFAllocatorDefault,0,&kCFTypeArrayCallBacks); + dobj->AddSupportedTypes(typesarray); + NSView* targetView = m_osxView; + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + targetView = [(NSScrollView*) m_osxView documentView]; + + [targetView registerForDraggedTypes:(NSArray*)typesarray]; + CFRelease(typesarray); + } +} void wxWidgetCocoaImpl::RemoveFromParent() { @@ -1043,41 +2229,66 @@ void wxWidgetCocoaImpl::Embed( wxWidgetImpl *parent ) NSView* container = parent->GetWXWidget() ; wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; [container addSubview:m_osxView]; + + if( m_wxPeer->IsFrozen() ) + [[m_osxView window] disableFlushWindow]; } -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)]]; + } +} + +bool wxWidgetCocoaImpl::SetBackgroundStyle( wxBackgroundStyle style ) +{ + BOOL opaque = ( style == wxBG_STYLE_PAINT ); + + if ( [m_osxView respondsToSelector:@selector(setOpaque:) ] ) + { + [m_osxView setOpaque: opaque]; + } + + return true ; } 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()]; } } - + 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:)] ) { @@ -1093,7 +2304,7 @@ void wxWidgetCocoaImpl::SetValue( wxInt32 v ) } } -void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) +void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) { if ( [m_osxView respondsToSelector:@selector(setMinValue:)] ) { @@ -1101,7 +2312,7 @@ void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) } } -void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) +void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) { if ( [m_osxView respondsToSelector:@selector(setMaxValue:)] ) { @@ -1109,33 +2320,83 @@ void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) } } -wxInt32 wxWidgetCocoaImpl::GetMinimum() const +wxInt32 wxWidgetCocoaImpl::GetMinimum() const { - if ( [m_osxView respondsToSelector:@selector(getMinValue:)] ) + if ( [m_osxView respondsToSelector:@selector(minValue)] ) { - 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:)] ) + if ( [m_osxView respondsToSelector:@selector(maxValue)] ) { - 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:)] ) { - [m_osxView setImage:bitmap.GetNSImage()]; + if (bitmap.IsOk()) + [m_osxView setImage:bitmap.GetNSImage()]; + else + [m_osxView setImage:nil]; + + [m_osxView setNeedsDisplay:YES]; } } -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 } @@ -1143,43 +2404,51 @@ 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; } } bool wxWidgetCocoaImpl::IsEnabled() const { - if ( [m_osxView respondsToSelector:@selector(isEnabled) ] ) - return [m_osxView isEnabled]; + NSView* targetView = m_osxView; + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + targetView = [(NSScrollView*) m_osxView documentView]; + + if ( [targetView respondsToSelector:@selector(isEnabled) ] ) + return [targetView isEnabled]; return true; } void wxWidgetCocoaImpl::Enable( bool enable ) { - if ( [m_osxView respondsToSelector:@selector(setEnabled:) ] ) - [m_osxView setEnabled:enable]; + NSView* targetView = m_osxView; + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + targetView = [(NSScrollView*) m_osxView documentView]; + + if ( [targetView respondsToSelector:@selector(setEnabled:) ] ) + [targetView setEnabled:enable]; } 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 : @@ -1199,16 +2468,60 @@ 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]; + } + + // we need to propagate this to inner views as well + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + { + NSView* targetView = [(NSScrollView*) m_osxView documentView]; + + if ( [targetView respondsToSelector:@selector(setControlSize:)] ) + [targetView setControlSize:size]; + else if ([targetView respondsToSelector:@selector(cell)]) + { + id cell = [(id)targetView cell]; + if ([cell respondsToSelector:@selector(setControlSize:)]) + [cell setControlSize:size]; + } + } +} + +void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&col, long, bool) +{ + NSView* targetView = m_osxView; + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + targetView = [(NSScrollView*) m_osxView documentView]; + + if ([targetView respondsToSelector:@selector(setFont:)]) + [targetView setFont: font.OSXGetNSFont()]; + if ([targetView respondsToSelector:@selector(setTextColor:)]) + [targetView 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::SetFont(wxFont const&, wxColour const&, long, bool) +void wxWidgetCocoaImpl::SetToolTip(wxToolTip* tooltip) { - // TODO + 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 ) @@ -1218,13 +2531,31 @@ void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control ) if ([c respondsToSelector:@selector(setAction:)]) { [c setTarget: c]; - [c setAction: @selector(controlAction:)]; + if ( dynamic_cast(GetWXPeer()) ) + { + // everything already set up + } + else + [c setAction: @selector(controlAction:)]; + if ([c respondsToSelector:@selector(setDoubleAction:)]) { [c setDoubleAction: @selector(controlDoubleAction:)]; } - + } + NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited|NSTrackingCursorUpdate|NSTrackingMouseMoved|NSTrackingActiveAlways|NSTrackingInVisibleRect; + NSTrackingArea* area = [[NSTrackingArea alloc] initWithRect: NSZeroRect options: options owner: m_osxView userInfo: nil]; + [m_osxView addTrackingArea: area]; + [area release]; + } + +bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text) +{ + wxKeyEvent wxevent(wxEVT_CHAR); + SetupKeyEvent( wxevent, event, text ); + + return GetWXPeer()->OSXHandleKeyEvent(wxevent); } bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event) @@ -1232,23 +2563,73 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event) wxKeyEvent wxevent(wxEVT_KEY_DOWN); SetupKeyEvent( wxevent, event ); - return GetWXPeer()->OSXHandleKeyEvent(wxevent); + // Generate wxEVT_CHAR_HOOK before sending any other events but only when + // the key is pressed, not when it's released (the type of wxevent is + // changed by SetupKeyEvent() so it can be wxEVT_KEY_UP too by now). + if ( wxevent.GetEventType() == wxEVT_KEY_DOWN ) + { + wxKeyEvent eventHook(wxEVT_CHAR_HOOK, wxevent); + if ( GetWXPeer()->OSXHandleKeyEvent(eventHook) + && !eventHook.IsNextEventAllowed() ) + return true; + } + + bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent); + + // this will fire higher level events, like insertText, to help + // us handle EVT_CHAR, etc. + + if ( !result ) + { + if ( [event type] == NSKeyDown) + { + long keycode = wxOSXTranslateCocoaKey( event, wxEVT_CHAR ); + + if ( (keycode > 0 && keycode < WXK_SPACE) || keycode == WXK_DELETE || keycode >= WXK_START ) + { + // eventually we could setup a doCommandBySelector catcher and retransform this into the wx key chars + wxKeyEvent wxevent2(wxevent) ; + wxevent2.SetEventType(wxEVT_CHAR); + SetupKeyEvent( wxevent2, event ); + wxevent2.m_keyCode = keycode; + result = GetWXPeer()->OSXHandleKeyEvent(wxevent2); + } + else if (wxevent.CmdDown()) + { + wxKeyEvent wxevent2(wxevent) ; + wxevent2.SetEventType(wxEVT_CHAR); + SetupKeyEvent( wxevent2, event ); + result = GetWXPeer()->OSXHandleKeyEvent(wxevent2); + } + else + { + if ( IsUserPane() && !wxevent.CmdDown() ) + { + 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]; - wxPoint pt = wxFromNSPoint( m_osxView, clickLocation ); wxMouseEvent wxevent(wxEVT_LEFT_DOWN); - SetupMouseEvent( wxevent , event ) ; - wxevent.m_x = pt.x; - wxevent.m_y = pt.y; + SetupMouseEvent(wxevent , event) ; + bool result = GetWXPeer()->HandleWindowEvent(wxevent); + + (void)SetupCursor(event); - return GetWXPeer()->HandleWindowEvent(wxevent); + return result; } -void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus) +void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow) { wxWindow* thisWindow = GetWXPeer(); if ( thisWindow->MacGetTopLevelWindow() && NeedsFocusRect() ) @@ -1258,7 +2639,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); @@ -1269,79 +2650,113 @@ 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 + else // !receivedFocus { #if wxUSE_CARET if ( thisWindow->GetCaret() ) 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) ; } } void wxWidgetCocoaImpl::SetCursor(const wxCursor& cursor) { - NSPoint location = [NSEvent mouseLocation]; - location = [[m_osxView window] convertScreenToBase:location]; - NSPoint locationInView = [m_osxView convertPoint:location fromView:nil]; - - if( NSMouseInRect(locationInView, [m_osxView bounds], YES) ) + if ( !wxIsBusy() ) { - [(NSCursor*)cursor.GetHCURSOR() set]; + NSPoint location = [NSEvent mouseLocation]; + location = [[m_osxView window] convertScreenToBase:location]; + NSPoint locationInView = [m_osxView convertPoint:location fromView:nil]; + + if( NSMouseInRect(locationInView, [m_osxView bounds], YES) ) + { + [(NSCursor*)cursor.GetHCURSOR() set]; + } } - [[m_osxView window] invalidateCursorRectsForView:m_osxView]; } void wxWidgetCocoaImpl::CaptureMouse() { - [[m_osxView window] disableCursorRects]; + // TODO remove if we don't get into problems with cursor settings + // [[m_osxView window] disableCursorRects]; } void wxWidgetCocoaImpl::ReleaseMouse() { - [[m_osxView window] enableCursorRects]; + // TODO remove if we don't get into problems with cursor settings + // [[m_osxView window] enableCursorRects]; } +#if !wxOSX_USE_NATIVE_FLIPPED + void wxWidgetCocoaImpl::SetFlipped(bool flipped) { m_isFlipped = flipped; } +#endif + +void wxWidgetCocoaImpl::SetDrawingEnabled(bool enabled) +{ + if ( enabled ) + { + [[m_osxView window] enableFlushWindow]; + [m_osxView setNeedsDisplay:YES]; + } + else + { + [[m_osxView window] disableFlushWindow]; + } +} // // 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]; - // temporary hook for dnd - [v registerForDraggedTypes:[NSArray arrayWithObjects: - NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]]; - - wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v ); + wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v, false, true ); 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]; + + wxWidgetCocoaImpl* c = NULL; + if ( now->IsNativeWindowWrapper() ) + { + NSView* cv = [tlw contentView]; + c = new wxWidgetCocoaImpl( now, cv, true ); + if ( cv != nil ) + { + // increase ref count, because the impl destructor will decrement it again + CFRetain(cv); + if ( !now->IsShown() ) + [cv setHidden:NO]; + } + } + else + { + wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]]; + c = new wxWidgetCocoaImpl( now, v, true ); + c->InstallEventHandler(); + [tlw setContentView:v]; + } return c; }