X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b030203c5926bd6af8bc310469c911f2143f7e1..a7734bdfb398c42321d985abdad7304bb3ac5182:/src/cocoa/NSView.mm?ds=inline diff --git a/src/cocoa/NSView.mm b/src/cocoa/NSView.mm index e5d83af0f2..72c6899868 100644 --- a/src/cocoa/NSView.mm +++ b/src/cocoa/NSView.mm @@ -6,7 +6,7 @@ // Created: 2003/02/15 // RCS-ID: $Id: // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -73,11 +73,21 @@ void wxCocoaNSView::DisassociateNSView(WX_NSView cocoaNSView) - (void)otherMouseDown:(NSEvent *)theEvent; - (void)otherMouseDragged:(NSEvent *)theEvent; - (void)otherMouseUp:(NSEvent *)theEvent; +- (void)resetCursorRects; @end // wxPoserNSView WX_IMPLEMENT_POSER(wxPoserNSView); @implementation wxPoserNSView : NSView +- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent +{ + bool acceptsFirstMouse = false; + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if(!win || !win->Cocoa_acceptsFirstMouse(acceptsFirstMouse, theEvent)) + acceptsFirstMouse = [super acceptsFirstMouse:theEvent]; + return acceptsFirstMouse; +} + - (void)drawRect: (NSRect)rect { wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); @@ -169,6 +179,13 @@ WX_IMPLEMENT_POSER(wxPoserNSView); [super otherMouseUp:theEvent]; } +- (void)resetCursorRects +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_resetCursorRects() ) + [super resetCursorRects]; +} + @end // implementation wxPoserNSView @interface wxNSViewNotificationObserver : NSObject