X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71da935dd278521462a5da9b6a73ed1c4e4cf711..33820d94285c0004acce756e7d10d9698e6387d1:/src/osx/cocoa/window.mm diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 1e7bfd251b..9ce10cc02c 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -82,12 +82,12 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const NSTrackingRectTag rectTag; } -// the tracking tag is needed to track mouse enter / exit events +// 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; @@ -114,14 +114,16 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const - (void)setTarget:(id)anObject; - (void)setAction:(SEL)aSelector; - (void)setDoubleAction:(SEL)aSelector; -@end +- (void)setBackgroundColor:(NSColor*)aColor; +- (void)setImagePosition:(NSCellImagePosition)aPosition; +@end long wxOSXTranslateCocoaKey( NSEvent* event ) { 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) @@ -130,7 +132,7 @@ long wxOSXTranslateCocoaKey( NSEvent* event ) { // backspace key case 0x7F : - case 8 : + case 8 : retval = WXK_BACK; break; case NSUpArrowFunctionKey : @@ -177,7 +179,7 @@ long wxOSXTranslateCocoaKey( NSEvent* event ) } } } - + // 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 @@ -208,17 +210,17 @@ long wxOSXTranslateCocoaKey( NSEvent* event ) retval = WXK_CONTROL; break; // clear key - case 71: + case 71: retval = WXK_CLEAR; break; // tab key - case 48: + case 48: retval = WXK_TAB; break; case 75: // / retval = WXK_NUMPAD_DIVIDE; - break; + break; case 67: // * retval = WXK_NUMPAD_MULTIPLY; break; @@ -271,7 +273,7 @@ long wxOSXTranslateCocoaKey( NSEvent* event ) return retval; } -void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charString = NULL ) +void wxWidgetCocoaImpl::SetupKeyEvent(wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charString) { UInt32 modifiers = [nsEvent modifierFlags] ; int eventType = [nsEvent type]; @@ -280,10 +282,10 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charStrin 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( (int)([nsEvent timestamp] * 1000) ) ; wxString chars; @@ -301,10 +303,10 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charStrin chars = wxCFStringRef::AsString(nschars); } } - + int aunichar = chars.Length() > 0 ? chars[0] : 0; long keyval = 0; - + if (wxevent.GetEventType() != wxEVT_CHAR) { keyval = wxOSXTranslateCocoaKey(nsEvent) ; @@ -345,17 +347,24 @@ void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charStrin else keyval = aunichar; } - + #if wxUSE_UNICODE 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] ; @@ -373,7 +382,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) wxevent.m_metaDown = modifiers & NSCommandKeyMask; wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ; - UInt32 mouseChord = 0; + UInt32 mouseChord = 0; switch (eventType) { @@ -519,9 +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 @@ -529,7 +543,7 @@ void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) + (void)initialize { static BOOL initialized = NO; - if (!initialized) + if (!initialized) { initialized = YES; wxOSXCocoaClassAddWXMethods( self ); @@ -562,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); } @@ -571,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); } @@ -580,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); } @@ -589,45 +603,45 @@ 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 ; } #endif -void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event) +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); } -void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text) +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) +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); } @@ -636,7 +650,7 @@ BOOL wxOSX_acceptsFirstResponder(NSView* self, SEL _cmd) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NO; - + return impl->acceptsFirstResponder(self, _cmd); } @@ -645,7 +659,7 @@ BOOL wxOSX_becomeFirstResponder(NSView* self, SEL _cmd) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return NO; - + return impl->becomeFirstResponder(self, _cmd); } @@ -654,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); } @@ -663,7 +677,7 @@ void wxOSX_resetCursorRects(NSView* self, SEL _cmd) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + impl->resetCursorRects(self, _cmd); } @@ -672,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; } @@ -681,7 +695,7 @@ 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); } @@ -690,7 +704,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); } @@ -699,7 +713,7 @@ void wxOSX_controlDoubleAction(NSView* self, SEL _cmd, id sender) wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); if (impl == NULL) return; - + impl->controlDoubleAction(self, _cmd, sender); } @@ -708,11 +722,11 @@ unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget WXUNUSED(slf), 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; @@ -728,12 +742,12 @@ unsigned int wxWidgetCocoaImpl::draggingEntered(void* s, WXWidget WXUNUSED(slf), 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 ) { @@ -753,16 +767,16 @@ void wxWidgetCocoaImpl::draggingExited(void* s, WXWidget WXUNUSED(slf), void *WX { 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(); @@ -774,11 +788,11 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget WXUNUSED(slf), 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; @@ -794,12 +808,12 @@ unsigned int wxWidgetCocoaImpl::draggingUpdated(void* s, WXWidget WXUNUSED(slf), 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 ) { @@ -821,7 +835,7 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), vo NSPasteboard *pboard = [sender draggingPasteboard]; NSDragOperation sourceDragMask = [sender draggingSourceOperationMask]; - + wxWindow* wxpeer = GetWXPeer(); wxDropTarget* target = wxpeer->GetDropTarget(); wxDragResult result = wxDragNone; @@ -835,7 +849,7 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), vo else if ( sourceDragMask & NSDragOperationMove ) result = wxDragMove; - PasteboardRef pboardRef; + PasteboardRef pboardRef; PasteboardCreate((CFStringRef)[pboard name], &pboardRef); target->SetCurrentDragPasteboard(pboardRef); @@ -843,7 +857,7 @@ bool wxWidgetCocoaImpl::performDragOperation(void* s, WXWidget WXUNUSED(slf), vo result = target->OnData(pt.x, pt.y, result); CFRelease(pboardRef); - + return result != wxDragNone; } @@ -869,11 +883,14 @@ void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd) void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd) { + 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; } void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd) @@ -883,7 +900,6 @@ void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd) wxOSX_TextEventHandlerPtr superimpl = (wxOSX_TextEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd]; superimpl(slf, (SEL)_cmd, text); } - m_lastKeyDownEvent = NULL; } @@ -908,7 +924,7 @@ 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(); + NSView* otherView = FindFocus(); wxWidgetImpl* otherWindow = FindFromWXWidget(otherView); BOOL r = superimpl(slf, (SEL)_cmd); @@ -927,7 +943,7 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd) // 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(); + 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 @@ -956,7 +972,7 @@ void wxWidgetCocoaImpl::resetCursorRects(WXWidget slf, void *_cmd) } } } - + bool wxWidgetCocoaImpl::isFlipped(WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd)) { return m_isFlipped; @@ -969,7 +985,7 @@ 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); @@ -990,7 +1006,7 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd)) CGContextTranslateCTM( context, 0, [m_osxView bounds].size.height ); CGContextScaleCTM( context, 1, -1 ); } - + wxRegion updateRgn; const NSRect *rects; NSInteger count; @@ -1004,9 +1020,9 @@ void wxWidgetCocoaImpl::drawRect(void* rect, WXWidget slf, void *WXUNUSED(_cmd)) wxWindow* wxpeer = GetWXPeer(); wxpeer->GetUpdateRegion() = updateRgn; wxpeer->MacSetCGContextRef( context ); - + bool handled = wxpeer->MacDoRedraw( 0 ); - + CGContextRestoreGState( context ); CGContextSaveGState( context ); @@ -1035,7 +1051,7 @@ void wxWidgetCocoaImpl::controlDoubleAction( WXWidget WXUNUSED(slf), void *WXUNU { } -// +// #if OBJC_API_VERSION >= 2 @@ -1074,11 +1090,11 @@ 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(insertText:), (IMP) wxOSX_insertText, "v@:@" ) wxOSX_CLASS_ADD_METHOD(c, @selector(performKeyEquivalent:), (IMP) wxOSX_performKeyEquivalent, "c@:@" ) @@ -1099,8 +1115,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 ); @@ -1127,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(); } @@ -1152,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; } @@ -1169,7 +1196,7 @@ void wxWidgetCocoaImpl::Raise() { // Not implemented } - + void wxWidgetCocoaImpl::Lower() { // Not implemented @@ -1194,7 +1221,7 @@ void wxWidgetCocoaImpl::ScrollRect( const wxRect *WXUNUSED(rect), int WXUNUSED(d 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 && [m_osxView superview] != parent->GetHandle() ) { @@ -1209,13 +1236,13 @@ void wxWidgetCocoaImpl::Move(int x, int y, int width, int height) [[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]; - + [[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]]; } } @@ -1239,10 +1266,10 @@ 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 = (int)rect.origin.y; int x = (int)rect.origin.x; if ( ![ m_osxView isFlipped ] ) @@ -1282,11 +1309,11 @@ bool wxWidgetCocoaImpl::HasFocus() const 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; @@ -1305,9 +1332,19 @@ 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 ) @@ -1323,21 +1360,21 @@ void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding 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:)] ) { @@ -1353,7 +1390,7 @@ void wxWidgetCocoaImpl::SetValue( wxInt32 v ) } } -void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) +void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) { if ( [m_osxView respondsToSelector:@selector(setMinValue:)] ) { @@ -1361,7 +1398,7 @@ void wxWidgetCocoaImpl::SetMinimum( wxInt32 v ) } } -void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) +void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) { if ( [m_osxView respondsToSelector:@selector(setMaxValue:)] ) { @@ -1369,7 +1406,7 @@ void wxWidgetCocoaImpl::SetMaximum( wxInt32 v ) } } -wxInt32 wxWidgetCocoaImpl::GetMinimum() const +wxInt32 wxWidgetCocoaImpl::GetMinimum() const { if ( [m_osxView respondsToSelector:@selector(getMinValue:)] ) { @@ -1378,7 +1415,7 @@ wxInt32 wxWidgetCocoaImpl::GetMinimum() const return 0; } -wxInt32 wxWidgetCocoaImpl::GetMaximum() const +wxInt32 wxWidgetCocoaImpl::GetMaximum() const { if ( [m_osxView respondsToSelector:@selector(getMaxValue:)] ) { @@ -1481,10 +1518,10 @@ void wxWidgetCocoaImpl::SetScrollThumb( wxInt32 WXUNUSED(val), wxInt32 WXUNUSED( { } -void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) +void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) { NSControlSize size = NSRegularControlSize; - + switch ( variant ) { case wxWINDOW_VARIANT_NORMAL : @@ -1509,12 +1546,12 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant ) } 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]; - } + 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& font, wxColour const&, long, bool) @@ -1535,7 +1572,7 @@ void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control ) { [c setDoubleAction: @selector(controlDoubleAction:)]; } - + } } @@ -1543,7 +1580,6 @@ bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text) { wxKeyEvent wxevent(wxEVT_CHAR); SetupKeyEvent( wxevent, event, text ); - wxevent.SetEventObject(GetWXPeer()); return GetWXPeer()->OSXHandleKeyEvent(wxevent); } @@ -1552,14 +1588,13 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event) { wxKeyEvent wxevent(wxEVT_KEY_DOWN); SetupKeyEvent( wxevent, event ); - wxevent.SetEventObject(GetWXPeer()); bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent); // this will fire higher level events, like insertText, to help // us handle EVT_CHAR, etc. - if ( !m_hasEditor && [event type] == NSKeyDown) + + if ( m_wxPeer->MacIsUserPane() && [event type] == NSKeyDown) { - m_lastKeyDownEvent = event; if ( !result ) { if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) @@ -1569,17 +1604,17 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *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 ) ; - wxevent.SetEventObject(GetWXPeer()); + SetupMouseEvent(wxevent , event) ; wxevent.m_x = pt.x; wxevent.m_y = pt.y; @@ -1619,7 +1654,7 @@ void wxWidgetCocoaImpl::DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* oth #endif wxLogTrace(wxT("Focus"), wxT("focus lost(%p)"), static_cast(thisWindow)); - + wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId()); event.SetEventObject(thisWindow); if (otherWindow) @@ -1660,7 +1695,7 @@ void wxWidgetCocoaImpl::SetFlipped(bool flipped) // Factory methods // -wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent), +wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent), wxWindowID WXUNUSED(id), const wxPoint& pos, const wxSize& size, long WXUNUSED(style), long WXUNUSED(extraStyle)) { @@ -1670,12 +1705,12 @@ wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WX // 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]];