X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/829a2e9521175cd943d671f16535242a467c4f91..1680c3561bc4f44c63a026e0d1a5324a39336156:/src/cocoa/NSView.mm

diff --git a/src/cocoa/NSView.mm b/src/cocoa/NSView.mm
index 7d864f2e30..9e9dcd9ca5 100644
--- a/src/cocoa/NSView.mm
+++ b/src/cocoa/NSView.mm
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/NSView.mm
+// Name:        src/cocoa/NSView.mm
 // Purpose:     wxCocoaNSView
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -22,12 +22,13 @@
     #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 <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>
 #include "wx/cocoa/objc/NSView.h"
+#include "wx/cocoa/ObjcRef.h"
 
 // ----------------------------------------------------------------------------
 // globals
@@ -166,20 +167,35 @@ void wxCocoaNSView::DisassociateNSView(WX_NSView cocoaNSView)
         [super resetCursorRects];
 }
 
+- (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];
+}
+
 @end // implementation WXNSView
+WX_IMPLEMENT_GET_OBJC_CLASS(WXNSView,NSView)
+
+// ============================================================================
+// @class wxNSViewNotificationObserver
+// ============================================================================
 
 @interface wxNSViewNotificationObserver : NSObject
 {
 }
 
-// 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)notificationFrameChanged: (NSNotification *)notification;
+- (void)synthesizeMouseMovedForView: (NSView *)theView;
 @end // interface wxNSViewNotificationObserver
+WX_DECLARE_GET_OBJC_CLASS(wxNSViewNotificationObserver,NSObject)
 
 @implementation wxNSViewNotificationObserver : NSObject
 
@@ -190,5 +206,17 @@ void *wxCocoaNSView::sm_cocoaObserver = [[wxNSViewNotificationObserver alloc] in
     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;