check for wxUSE_TIMER in headers, not the files including them

[wxWidgets.git] / include / wx / cocoa / NSView.h

diff --git a/include/wx/cocoa/NSView.h b/include/wx/cocoa/NSView.h
index 37e70160835d6f540a99f687c76ea08d56d3f50a..39e64fe5290791e956d2b1d9abafed1b769f8284 100644 (file)
--- a/include/wx/cocoa/NSView.h
+++ b/include/wx/cocoa/NSView.h
@@ -15,7 +15,12 @@
 #include "wx/hashmap.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
+
 class wxWindow;
 
 WX_DECLARE_OBJC_HASHMAP(NSView);
@@ -32,6 +37,7 @@ public:
     virtual wxWindow* GetWxWindow() const
     {   return NULL; }
     virtual void Cocoa_FrameChanged(void) = 0;
+    virtual void Cocoa_synthesizeMouseMoved(void) = 0;
     virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent)
     {   return false; }
     virtual bool Cocoa_drawRect(const NSRect &rect)
@@ -62,6 +68,10 @@ public:
     {   return false; }
     virtual bool Cocoa_resetCursorRects()
     {   return false; }
+    virtual bool Cocoa_viewDidMoveToWindow()
+    {   return false; }
+    virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow newWindow)
+    {   return false; }
     virtual ~wxCocoaNSView() { }
 };