X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe802fc2edc8e3e78f812254582af0ee91da2ea0..11fe6505b848a968f4c89cb3c3fd37a6a03bcaea:/src/cocoa/NSView.mm?ds=inline diff --git a/src/cocoa/NSView.mm b/src/cocoa/NSView.mm index ec0be69062..5c4b2a5680 100644 --- a/src/cocoa/NSView.mm +++ b/src/cocoa/NSView.mm @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/02/15 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -22,11 +22,12 @@ #include "wx/window.h" #endif // WX_PRECOMP +#include "wx/cocoa/objc/objc_uniquifying.h" #include "wx/cocoa/NSView.h" -#import #import #import +#include "wx/cocoa/objc/NSView.h" // ---------------------------------------------------------------------------- // globals @@ -35,41 +36,37 @@ WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSView) void wxCocoaNSView::AssociateNSView(WX_NSView cocoaNSView) { - sm_cocoaHash.insert(wxCocoaNSViewHash::value_type(cocoaNSView,this)); - [[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(notificationFrameChanged:) name:@"NSViewFrameDidChangeNotification" object:cocoaNSView]; - [cocoaNSView setPostsFrameChangedNotifications: YES]; + if(cocoaNSView) + { + sm_cocoaHash.insert(wxCocoaNSViewHash::value_type(cocoaNSView,this)); + [[NSNotificationCenter defaultCenter] addObserver:(id)sm_cocoaObserver selector:@selector(notificationFrameChanged:) name:@"NSViewFrameDidChangeNotification" object:cocoaNSView]; + [cocoaNSView setPostsFrameChangedNotifications: YES]; + } } void wxCocoaNSView::DisassociateNSView(WX_NSView cocoaNSView) { - sm_cocoaHash.erase(cocoaNSView); - [[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:@"NSViewFrameDidChangeNotification" object:cocoaNSView]; + if(cocoaNSView) + { + sm_cocoaHash.erase(cocoaNSView); + [[NSNotificationCenter defaultCenter] removeObserver:(id)sm_cocoaObserver name:@"NSViewFrameDidChangeNotification" object:cocoaNSView]; + } } // ============================================================================ -// @class wxPoserNSView +// @class WXNSView // ============================================================================ -@interface wxPoserNSView : NSView -{ -} -- (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 +@implementation WXNSView : NSView -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 { @@ -162,29 +159,61 @@ WX_IMPLEMENT_POSER(wxPoserNSView); [super otherMouseUp:theEvent]; } -@end // implementation wxPoserNSView +- (void)resetCursorRects +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_resetCursorRects() ) + [super resetCursorRects]; +} -@interface wxNSViewNotificationObserver : NSObject +- (void)viewDidMoveToWindow { + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_viewDidMoveToWindow() ) + [super viewDidMoveToWindow]; } -// FIXME: Initializing like this is a really bad idea. If for some reason -// we ever require posing as an NSObject we won't be able to since an instance -// will have already been created here. Of course, catching messages for -// NSObject seems like a LOT of overkill, so I doubt we ever will anyway! -void *wxCocoaNSView::sm_cocoaObserver = [[wxNSViewNotificationObserver alloc] init]; +- (void)viewWillMoveToWindow:(NSWindow *)newWindow +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self); + if( !win || !win->Cocoa_viewWillMoveToWindow(newWindow) ) + [super viewWillMoveToWindow:newWindow]; +} + +@end // implementation WXNSView +WX_IMPLEMENT_GET_OBJC_CLASS(WXNSView,NSView) + +// ============================================================================ +// @class wxNSViewNotificationObserver +// ============================================================================ + +@interface wxNSViewNotificationObserver : NSObject +{ +} - (void)notificationFrameChanged: (NSNotification *)notification; +- (void)synthesizeMouseMovedForView: (NSView *)theView; @end // interface wxNSViewNotificationObserver +WX_DECLARE_GET_OBJC_CLASS(wxNSViewNotificationObserver,NSObject) @implementation wxNSViewNotificationObserver : NSObject - (void)notificationFrameChanged: (NSNotification *)notification; { wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa([notification object]); - wxCHECK_RET(win,"notificationFrameChanged received but no wxWindow exists"); + wxCHECK_RET(win,wxT("notificationFrameChanged received but no wxWindow exists")); win->Cocoa_FrameChanged(); } +- (void)synthesizeMouseMovedForView: (NSView *)theView +{ + wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(theView); + wxCHECK_RET(win,wxT("synthesizeMouseMovedForView received but no wxWindow exists")); + win->Cocoa_synthesizeMouseMoved(); +} + @end // implementation wxNSViewNotificationObserver +WX_IMPLEMENT_GET_OBJC_CLASS(wxNSViewNotificationObserver,NSObject) + +void *wxCocoaNSView::sm_cocoaObserver = [[WX_GET_OBJC_CLASS(wxNSViewNotificationObserver) alloc] init];