/////////////////////////////////////////////////////////////////////////////
-// Name: cocoa/NSView.mm
+// Name: src/cocoa/NSView.mm
// Purpose: wxCocoaNSView
// Author: David Elliott
// Modified by:
// Created: 2003/02/15
-// RCS-ID: $Id:
+// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
#include "wx/window.h"
#endif // WX_PRECOMP
-#include "wx/cocoa/ObjcPose.h"
+#include "wx/cocoa/objc/objc_uniquifying.h"
#include "wx/cocoa/NSView.h"
-#import <AppKit/NSView.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSString.h>
+#include "wx/cocoa/objc/NSView.h"
+#include "wx/cocoa/ObjcRef.h"
// ----------------------------------------------------------------------------
// globals
}
// ============================================================================
-// @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
{
[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];
+}
+
+- (void)viewWillMoveToWindow:(NSWindow *)newWindow
{
+ wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+ if( !win || !win->Cocoa_viewWillMoveToWindow(newWindow) )
+ [super viewWillMoveToWindow:newWindow];
}
-// 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];
+@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)
+// New CF-retained observer (this should have been using wxObjcAutoRefFromAlloc to begin with)
+wxObjcAutoRefFromAlloc<wxNSViewNotificationObserver*> s_cocoaNSViewObserver([[WX_GET_OBJC_CLASS(wxNSViewNotificationObserver) alloc] init]);
+// For compatibility with old code
+id wxCocoaNSView::sm_cocoaObserver = s_cocoaNSViewObserver;