Add WXUNUSED to unused parameters in several inline-implemented methods.

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

diff --git a/include/wx/cocoa/NSView.h b/include/wx/cocoa/NSView.h
index f9c023dbb8fc474c15ea7460b78f57c046ac8749..9cea1d678aa52cb7aa26e97c6865b7070dd61795 100644 (file)
--- a/include/wx/cocoa/NSView.h
+++ b/include/wx/cocoa/NSView.h
@@ -4,9 +4,9 @@
 // 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
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSVIEW_H__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSVIEW_H__


@@ -15,7 +15,13 @@
 #include "wx/hashmap.h"
 #include "wx/cocoa/ObjcAssociate.h"
 
 #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;
 typedef struct _NSRect NSRect;

+#endif
+
+class wxWindow;

 
 WX_DECLARE_OBJC_HASHMAP(NSView);
 class wxCocoaNSView
 
 WX_DECLARE_OBJC_HASHMAP(NSView);
 class wxCocoaNSView


@@ -28,33 +34,46 @@ public:
 protected:
     static void *sm_cocoaObserver;
 public:
 protected:
     static void *sm_cocoaObserver;
 public:

+    virtual wxWindow* GetWxWindow() const
+    {   return NULL; }

     virtual void Cocoa_FrameChanged(void) = 0;
     virtual void Cocoa_FrameChanged(void) = 0;

-    virtual bool Cocoa_drawRect(const NSRect &rect)
+    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; }
     {   return false; }

-    virtual bool Cocoa_mouseDown(WX_NSEvent theEvent)
+    virtual bool Cocoa_mouseMoved(WX_NSEvent WXUNUSED(theEvent))

     {   return false; }
     {   return false; }

-    virtual bool Cocoa_mouseDragged(WX_NSEvent theEvent)
+    virtual bool Cocoa_mouseEntered(WX_NSEvent WXUNUSED(theEvent))

     {   return false; }
     {   return false; }

-    virtual bool Cocoa_mouseUp(WX_NSEvent theEvent)
+    virtual bool Cocoa_mouseExited(WX_NSEvent WXUNUSED(theEvent))

     {   return false; }
     {   return false; }

-    virtual bool Cocoa_mouseMoved(WX_NSEvent theEvent)
+    virtual bool Cocoa_rightMouseDown(WX_NSEvent WXUNUSED(theEvent))

     {   return false; }
     {   return false; }

-    virtual bool Cocoa_mouseEntered(WX_NSEvent theEvent)
+    virtual bool Cocoa_rightMouseDragged(WX_NSEvent WXUNUSED(theEvent))

     {   return false; }
     {   return false; }

-    virtual bool Cocoa_mouseExited(WX_NSEvent theEvent)
+    virtual bool Cocoa_rightMouseUp(WX_NSEvent WXUNUSED(theEvent))

     {   return false; }
     {   return false; }

-    virtual bool Cocoa_rightMouseDown(WX_NSEvent theEvent)
+    virtual bool Cocoa_otherMouseDown(WX_NSEvent WXUNUSED(theEvent))

     {   return false; }
     {   return false; }

-    virtual bool Cocoa_rightMouseDragged(WX_NSEvent theEvent)
+    virtual bool Cocoa_otherMouseDragged(WX_NSEvent WXUNUSED(theEvent))

     {   return false; }
     {   return false; }

-    virtual bool Cocoa_rightMouseUp(WX_NSEvent theEvent)
+    virtual bool Cocoa_otherMouseUp(WX_NSEvent WXUNUSED(theEvent))

     {   return false; }
     {   return false; }

-    virtual bool Cocoa_otherMouseDown(WX_NSEvent theEvent)
+    virtual bool Cocoa_resetCursorRects()

     {   return false; }
     {   return false; }

-    virtual bool Cocoa_otherMouseDragged(WX_NSEvent theEvent)
+    virtual bool Cocoa_viewDidMoveToWindow()

     {   return false; }
     {   return false; }

-    virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent)
+    virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow WXUNUSED(newWindow))

     {   return false; }
     {   return false; }

+    virtual ~wxCocoaNSView() { }

 };
 
 };
 

-#endif // _WX_COCOA_NSVIEW_H_
+#endif
+    // __WX_COCOA_NSVIEW_H__