Correct signature of HitTest()

[wxWidgets.git] / src / cocoa / NSView.mm

diff --git a/src/cocoa/NSView.mm b/src/cocoa/NSView.mm
index b794f269497abcbacf1cae19b532a9f06a9cdfb4..5c4b2a5680110e7ec258e1e644a46b9766d01367 100644 (file)
--- a/src/cocoa/NSView.mm
+++ b/src/cocoa/NSView.mm
@@ -166,6 +166,20 @@ 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)
 
@@ -178,6 +192,7 @@ WX_IMPLEMENT_GET_OBJC_CLASS(WXNSView,NSView)
 }
 
 - (void)notificationFrameChanged: (NSNotification *)notification;
+- (void)synthesizeMouseMovedForView: (NSView *)theView;
 @end // interface wxNSViewNotificationObserver
 WX_DECLARE_GET_OBJC_CLASS(wxNSViewNotificationObserver,NSObject)
 
@@ -190,6 +205,13 @@ WX_DECLARE_GET_OBJC_CLASS(wxNSViewNotificationObserver,NSObject)
     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)