X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe802fc2edc8e3e78f812254582af0ee91da2ea0..fe79f76ba9aa2f89165481d7ed796f69df979875:/include/wx/cocoa/NSView.h?ds=sidebyside

diff --git a/include/wx/cocoa/NSView.h b/include/wx/cocoa/NSView.h
index db6eb26c38..4081d71eda 100644
--- a/include/wx/cocoa/NSView.h
+++ b/include/wx/cocoa/NSView.h
@@ -4,18 +4,26 @@
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSVIEW_H__
 #define __WX_COCOA_NSVIEW_H__
 
 #include "wx/hashmap.h"
-#include "wx/cocoa/ObjcPose.h"
+#include "wx/cocoa/ObjcAssociate.h"
 
+#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64)
+typedef struct CGRect NSRect;
+#else
 typedef struct _NSRect NSRect;
+#endif
+
+struct objc_object;
+
+class wxWindow;
 
 WX_DECLARE_OBJC_HASHMAP(NSView);
 class wxCocoaNSView
@@ -26,22 +34,48 @@ public:
     void AssociateNSView(WX_NSView cocoaNSView);
     void DisassociateNSView(WX_NSView cocoaNSView);
 protected:
-    static void *sm_cocoaObserver;
+    static struct objc_object *sm_cocoaObserver;
 public:
+    virtual wxWindow* GetWxWindow() const
+    {   return NULL; }
     virtual void Cocoa_FrameChanged(void) = 0;
-    virtual bool Cocoa_drawRect(const NSRect &rect) = 0;
-    virtual bool Cocoa_mouseDown(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_mouseDragged(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_mouseUp(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_mouseMoved(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_mouseEntered(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_mouseExited(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_rightMouseDown(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_rightMouseDragged(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_rightMouseUp(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_otherMouseDown(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_otherMouseDragged(WX_NSEvent theEvent) = 0;
-    virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent) = 0;
+    virtual void Cocoa_synthesizeMouseMoved(void) = 0;
+    virtual bool Cocoa_acceptsFirstMouse(bool &WXUNUSED(acceptsFirstMouse), WX_NSEvent WXUNUSED(theEvent))
+    {   return false; }
+    virtual bool Cocoa_drawRect(const NSRect &WXUNUSED(rect))
+    {   return false; }
+    virtual bool Cocoa_mouseDown(WX_NSEvent WXUNUSED(theEvent))
+    {   return false; }
+    virtual bool Cocoa_mouseDragged(WX_NSEvent WXUNUSED(theEvent))
+    {   return false; }
+    virtual bool Cocoa_mouseUp(WX_NSEvent WXUNUSED(theEvent))
+    {   return false; }
+    virtual bool Cocoa_mouseMoved(WX_NSEvent WXUNUSED(theEvent))
+    {   return false; }
+    virtual bool Cocoa_mouseEntered(WX_NSEvent WXUNUSED(theEvent))
+    {   return false; }
+    virtual bool Cocoa_mouseExited(WX_NSEvent WXUNUSED(theEvent))
+    {   return false; }
+    virtual bool Cocoa_rightMouseDown(WX_NSEvent WXUNUSED(theEvent))
+    {   return false; }
+    virtual bool Cocoa_rightMouseDragged(WX_NSEvent WXUNUSED(theEvent))
+    {   return false; }
+    virtual bool Cocoa_rightMouseUp(WX_NSEvent WXUNUSED(theEvent))
+    {   return false; }
+    virtual bool Cocoa_otherMouseDown(WX_NSEvent WXUNUSED(theEvent))
+    {   return false; }
+    virtual bool Cocoa_otherMouseDragged(WX_NSEvent WXUNUSED(theEvent))
+    {   return false; }
+    virtual bool Cocoa_otherMouseUp(WX_NSEvent WXUNUSED(theEvent))
+    {   return false; }
+    virtual bool Cocoa_resetCursorRects()
+    {   return false; }
+    virtual bool Cocoa_viewDidMoveToWindow()
+    {   return false; }
+    virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow WXUNUSED(newWindow))
+    {   return false; }
+    virtual ~wxCocoaNSView() { }
 };
 
-#endif // _WX_COCOA_NSVIEW_H_
+#endif
+    // __WX_COCOA_NSVIEW_H__