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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/NSMenu.h b/include/wx/cocoa/NSMenu.h
index 281bf55d4d0b9c0d3a23880cb3ef4b851b8c36a9..6438f1e02d1b75a9f511a4945b5527bea05b2706 100644 (file)
--- a/include/wx/cocoa/NSMenu.h
+++ b/include/wx/cocoa/NSMenu.h
@@ -35,11 +35,11 @@ public:
     ,   OBSERVE_WillSendAction      = 0x10
     };
     virtual void Cocoa_dealloc() {}
     ,   OBSERVE_WillSendAction      = 0x10
     };
     virtual void Cocoa_dealloc() {}

-    virtual void CocoaNotification_menuDidAddItem(WX_NSNotification notification) {}
-    virtual void CocoaNotification_menuDidChangeItem(WX_NSNotification notification) {}
-    virtual void CocoaNotification_menuDidRemoveItem(WX_NSNotification notification) {}
-    virtual void CocoaNotification_menuDidSendAction(WX_NSNotification notification) {}
-    virtual void CocoaNotification_menuWillSendAction(WX_NSNotification notification) {}
+    virtual void CocoaNotification_menuDidAddItem(WX_NSNotification WXUNUSED(notification)) {}
+    virtual void CocoaNotification_menuDidChangeItem(WX_NSNotification WXUNUSED(notification)) {}
+    virtual void CocoaNotification_menuDidRemoveItem(WX_NSNotification WXUNUSED(notification)) {}
+    virtual void CocoaNotification_menuDidSendAction(WX_NSNotification WXUNUSED(notification)) {}
+    virtual void CocoaNotification_menuWillSendAction(WX_NSNotification WXUNUSED(notification)) {}

     virtual ~wxCocoaNSMenu() { }
 
 protected:
     virtual ~wxCocoaNSMenu() { }
 
 protected:

diff --git a/include/wx/cocoa/NSView.h b/include/wx/cocoa/NSView.h
index 39e64fe5290791e956d2b1d9abafed1b769f8284..9cea1d678aa52cb7aa26e97c6865b7070dd61795 100644 (file)
--- a/include/wx/cocoa/NSView.h
+++ b/include/wx/cocoa/NSView.h
@@ -38,39 +38,39 @@ public:
     {   return NULL; }
     virtual void Cocoa_FrameChanged(void) = 0;
     virtual void Cocoa_synthesizeMouseMoved(void) = 0;
     {   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() { }
 };

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index fd61cd250d66ef584cea7329c926527045870083..2a8e1a2e7a58cb25596bd9412a755233f8fd1a1e 100644 (file)
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -30,9 +30,9 @@ class WXDLLIMPEXP_CORE wxCocoaNSWindow
 public:
     void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
     void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);
 public:
     void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
     void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);

-    virtual bool Cocoa_canBecomeKeyWindow(bool &canBecome)
+    virtual bool Cocoa_canBecomeKeyWindow(bool &WXUNUSED(canBecome))

     {   return false; }
     {   return false; }

-    virtual bool Cocoa_canBecomeMainWindow(bool &canBecome)
+    virtual bool Cocoa_canBecomeMainWindow(bool &WXUNUSED(canBecome))

     {   return false; }
     virtual bool CocoaDelegate_windowShouldClose(void) = 0;
     virtual void CocoaDelegate_windowWillClose(void) = 0;
     {   return false; }
     virtual bool CocoaDelegate_windowShouldClose(void) = 0;
     virtual void CocoaDelegate_windowWillClose(void) = 0;

diff --git a/include/wx/cocoa/notebook.h b/include/wx/cocoa/notebook.h
index 9ff89def2885294564ff4e85c3448cc8f7a255fb..8083ec895bc3568628e2ce9f548bb9f282bd05ea 100644 (file)
--- a/include/wx/cocoa/notebook.h
+++ b/include/wx/cocoa/notebook.h
@@ -48,7 +48,7 @@ public:
 // ------------------------------------------------------------------------
 protected:
     // Notebooks cannot be enabled/disabled
 // ------------------------------------------------------------------------
 protected:
     // Notebooks cannot be enabled/disabled

-    virtual void CocoaSetEnabled(bool enable) { }
+    virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { }

     virtual void CocoaDelegate_tabView_didSelectTabViewItem(WX_NSTabViewItem tabviewItem);
     virtual bool CocoaDelegate_tabView_shouldSelectTabViewItem(WX_NSTabViewItem tabviewItem);
 // ------------------------------------------------------------------------
     virtual void CocoaDelegate_tabView_didSelectTabViewItem(WX_NSTabViewItem tabviewItem);
     virtual bool CocoaDelegate_tabView_shouldSelectTabViewItem(WX_NSTabViewItem tabviewItem);
 // ------------------------------------------------------------------------

diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h
index 4303324e0378cd1841ac6cb2e19d3cd8c993fd43..91e6fd0082c34215bf65ca432ed42d0a34f10d74 100644 (file)
--- a/include/wx/cocoa/window.h
+++ b/include/wx/cocoa/window.h
@@ -100,7 +100,7 @@ public:
 #endif //def __OBJC__
 protected:
     // actually enable/disable the cocoa control, overridden by subclasses
 #endif //def __OBJC__
 protected:
     // actually enable/disable the cocoa control, overridden by subclasses

-    virtual void CocoaSetEnabled(bool enable) { }
+    virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { }

 
     void CocoaCreateNSScrollView();
     void InitMouseEvent(wxMouseEvent &event, WX_NSEvent cocoaEvent);
 
     void CocoaCreateNSScrollView();
     void InitMouseEvent(wxMouseEvent &event, WX_NSEvent cocoaEvent);