Correct signature of HitTest()

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

diff --git a/src/cocoa/NSView.mm b/src/cocoa/NSView.mm
index 7a4d133ff4d7dea8826ce6ee9eb6157179bd4c26..5c4b2a5680110e7ec258e1e644a46b9766d01367 100644 (file)
--- a/src/cocoa/NSView.mm
+++ b/src/cocoa/NSView.mm
@@ -4,7 +4,7 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////


@@ -22,12 +22,12 @@
     #include "wx/window.h"
 #endif // WX_PRECOMP
 
     #include "wx/window.h"
 #endif // WX_PRECOMP
 

-#include "wx/cocoa/ObjcPose.h"
+#include "wx/cocoa/objc/objc_uniquifying.h"

 #include "wx/cocoa/NSView.h"
 
 #include "wx/cocoa/NSView.h"
 

-#import <AppKit/NSView.h>

 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>

+#include "wx/cocoa/objc/NSView.h"

 
 // ----------------------------------------------------------------------------
 // globals
 
 // ----------------------------------------------------------------------------
 // globals


@@ -54,29 +54,19 @@ void wxCocoaNSView::DisassociateNSView(WX_NSView 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
 {
 
 - (void)drawRect: (NSRect)rect
 {


@@ -169,20 +159,42 @@ WX_IMPLEMENT_POSER(wxPoserNSView);
         [super otherMouseUp:theEvent];
 }
 
         [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)notificationFrameChanged: (NSNotification *)notification;

+- (void)synthesizeMouseMovedForView: (NSView *)theView;

 @end // interface wxNSViewNotificationObserver
 @end // interface wxNSViewNotificationObserver

+WX_DECLARE_GET_OBJC_CLASS(wxNSViewNotificationObserver,NSObject)

 
 @implementation wxNSViewNotificationObserver : NSObject
 
 
 @implementation wxNSViewNotificationObserver : NSObject
 


@@ -193,5 +205,15 @@ void *wxCocoaNSView::sm_cocoaObserver = [[wxNSViewNotificationObserver alloc] in
     win->Cocoa_FrameChanged();
 }
 
     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
 @end // implementation wxNSViewNotificationObserver

+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSViewNotificationObserver,NSObject)
+
+void *wxCocoaNSView::sm_cocoaObserver = [[WX_GET_OBJC_CLASS(wxNSViewNotificationObserver) alloc] init];