Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

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

diff --git a/include/wx/cocoa/NSView.h b/include/wx/cocoa/NSView.h
index 39e64fe5290791e956d2b1d9abafed1b769f8284..4081d71eda3b1ecd49d416e7cc214c6edfa026a7 100644 (file)
--- a/include/wx/cocoa/NSView.h
+++ b/include/wx/cocoa/NSView.h
@@ -21,6 +21,8 @@ typedef struct CGRect NSRect;
 typedef struct _NSRect NSRect;
 #endif
 
 typedef struct _NSRect NSRect;
 #endif
 

+struct objc_object;
+

 class wxWindow;
 
 WX_DECLARE_OBJC_HASHMAP(NSView);
 class wxWindow;
 
 WX_DECLARE_OBJC_HASHMAP(NSView);


@@ -32,45 +34,45 @@ public:
     void AssociateNSView(WX_NSView cocoaNSView);
     void DisassociateNSView(WX_NSView cocoaNSView);
 protected:
     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 void Cocoa_synthesizeMouseMoved(void) = 0;
 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)
+    virtual bool Cocoa_acceptsFirstMouse(bool &WXUNUSED(acceptsFirstMouse), WX_NSEvent WXUNUSED(theEvent))

     {   return false; }
     {   return false; }

-    virtual bool Cocoa_drawRect(const NSRect &rect)
+    virtual bool Cocoa_drawRect(const NSRect &WXUNUSED(rect))

     {   return false; }
     {   return false; }

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

     {   return false; }
     {   return false; }

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

     {   return false; }
     {   return false; }

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

     {   return false; }
     {   return false; }

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

     {   return false; }
     {   return false; }

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

     {   return false; }
     {   return false; }

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

     {   return false; }
     {   return false; }

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

     {   return false; }
     {   return false; }

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

     {   return false; }
     {   return false; }

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

     {   return false; }
     {   return false; }

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

     {   return false; }
     {   return false; }

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

     {   return false; }
     {   return false; }

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

     {   return false; }
     virtual bool Cocoa_resetCursorRects()
     {   return false; }
     virtual bool Cocoa_viewDidMoveToWindow()
     {   return false; }
     {   return false; }
     virtual bool Cocoa_resetCursorRects()
     {   return false; }
     virtual bool Cocoa_viewDidMoveToWindow()
     {   return false; }

-    virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow newWindow)
+    virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow WXUNUSED(newWindow))

     {   return false; }
     virtual ~wxCocoaNSView() { }
 };
     {   return false; }
     virtual ~wxCocoaNSView() { }
 };