X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb896a322a2ed53d393ee738765ddd3f72cee004..ce51dc7507f31a6baadb8709ac4b807cd2dad421:/src/cocoa/NSView.mm diff --git a/src/cocoa/NSView.mm b/src/cocoa/NSView.mm index 0238c5c50a..280c06b91b 100644 --- a/src/cocoa/NSView.mm +++ b/src/cocoa/NSView.mm @@ -22,6 +22,7 @@ #include "wx/window.h" #endif // WX_PRECOMP +#include "wx/cocoa/ObjcPose.h" #include "wx/cocoa/NSView.h" #import @@ -53,11 +54,115 @@ void wxCocoaNSView::DisassociateNSView(WX_NSView cocoaNSView) { } +- (void)drawRect: (NSRect)rect; +- (void)mouseDown:(NSEvent *)theEvent; +- (void)mouseDragged:(NSEvent *)theEvent; +- (void)mouseUp:(NSEvent *)theEvent; +- (void)mouseMoved:(NSEvent *)theEvent; +- (void)mouseEntered:(NSEvent *)theEvent; +- (void)mouseExited:(NSEvent *)theEvent; +- (void)rightMouseDown:(NSEvent *)theEvent; +- (void)rightMouseDragged:(NSEvent *)theEvent; +- (void)rightMouseUp:(NSEvent *)theEvent; +- (void)otherMouseDown:(NSEvent *)theEvent; +- (void)otherMouseDragged:(NSEvent *)theEvent; +- (void)otherMouseUp:(NSEvent *)theEvent; @end // wxPoserNSView WX_IMPLEMENT_POSER(wxPoserNSView); @implementation wxPoserNSView : NSView +- (void)drawRect: (NSRect)rect +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_drawRect(rect) ) + [super drawRect:rect]; +} + +- (void)mouseDown:(NSEvent *)theEvent +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_mouseDown(theEvent) ) + [super mouseDown:theEvent]; +} + +- (void)mouseDragged:(NSEvent *)theEvent +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_mouseDragged(theEvent) ) + [super mouseDragged:theEvent]; +} + +- (void)mouseUp:(NSEvent *)theEvent +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_mouseUp(theEvent) ) + [super mouseUp:theEvent]; +} + +- (void)mouseMoved:(NSEvent *)theEvent +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_mouseMoved(theEvent) ) + [super mouseMoved:theEvent]; +} + +- (void)mouseEntered:(NSEvent *)theEvent +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_mouseEntered(theEvent) ) + [super mouseEntered:theEvent]; +} + +- (void)mouseExited:(NSEvent *)theEvent +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_mouseExited(theEvent) ) + [super mouseExited:theEvent]; +} + +- (void)rightMouseDown:(NSEvent *)theEvent +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_rightMouseDown(theEvent) ) + [super rightMouseDown:theEvent]; +} + +- (void)rightMouseDragged:(NSEvent *)theEvent +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_rightMouseDragged(theEvent) ) + [super rightMouseDragged:theEvent]; +} + +- (void)rightMouseUp:(NSEvent *)theEvent +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_rightMouseUp(theEvent) ) + [super rightMouseUp:theEvent]; +} + +- (void)otherMouseDown:(NSEvent *)theEvent +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_otherMouseDown(theEvent) ) + [super otherMouseDown:theEvent]; +} + +- (void)otherMouseDragged:(NSEvent *)theEvent +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_otherMouseDragged(theEvent) ) + [super otherMouseDragged:theEvent]; +} + +- (void)otherMouseUp:(NSEvent *)theEvent +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_otherMouseUp(theEvent) ) + [super otherMouseUp:theEvent]; +} + @end // implementation wxPoserNSView @interface wxNSViewNotificationObserver : NSObject