fixing unused param warning

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

diff --git a/src/osx/carbon/bmpbuttn.cpp b/src/osx/carbon/bmpbuttn.cpp
index 2b5eddec7c9cea596f3df6ac42bd6be2e173fd5e..1ef6688d463300993d7a0866e23522c26ea9c923 100644 (file)
--- a/src/osx/carbon/bmpbuttn.cpp
+++ b/src/osx/carbon/bmpbuttn.cpp
@@ -116,12 +116,12 @@ public:
 
 wxWidgetImplType* wxWidgetImpl::CreateBitmapButton( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowID WXUNUSED(id), 
                                     const wxBitmap& bitmap,
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 
-                                    long extraStyle)
+                                    long WXUNUSED(extraStyle))
 {
     OSStatus err = noErr;
     ControlButtonContentInfo info;

diff --git a/src/osx/carbon/button.cpp b/src/osx/carbon/button.cpp
index 955a27382f2ca66d1183778512af84591f601aa4..14ff0c1f5570dfd1e6a3a7a9360f1fa96fc35a94 100644 (file)
--- a/src/osx/carbon/button.cpp
+++ b/src/osx/carbon/button.cpp
@@ -116,8 +116,8 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer,
                                     const wxString& label,
                                     const wxPoint& pos, 
                                     const wxSize& size,
-                                    long style, 
-                                    long extraStyle) 
+                                    long WXUNUSED(style), 
+                                    long WXUNUSED(extraStyle)) 
 {
     OSStatus err;
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
@@ -175,12 +175,12 @@ void wxMacControl::SetDefaultButton( bool isDefault )
 
 wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowID WXUNUSED(id), 
                                     const wxString& label,
                                     const wxPoint& pos, 
                                     const wxSize& size,
-                                    long style, 
-                                    long extraStyle) 
+                                    long WXUNUSED(style), 
+                                    long WXUNUSED(extraStyle)) 
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;

diff --git a/src/osx/carbon/checkbox.cpp b/src/osx/carbon/checkbox.cpp
index f31d0413fc31451773d9a6f6d39415e5413951ef..3dff92a7d532052cda5b6f37df866ee45825fc5c 100644 (file)
--- a/src/osx/carbon/checkbox.cpp
+++ b/src/osx/carbon/checkbox.cpp
@@ -18,12 +18,12 @@
 
 wxWidgetImplType* wxWidgetImpl::CreateCheckBox( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxString& label,
+                                    wxWindowID WXUNUSED(id), 
+                                    const wxString& WXUNUSED(label),
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 
-                                    long extraStyle) 
+                                    long WXUNUSED(extraStyle)) 
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;

diff --git a/src/osx/carbon/choice.cpp b/src/osx/carbon/choice.cpp
index 182d21f3e16ee09511f2c7f73342234f5363d64f..1985f812055a5a381e1395184c0cdae82ba64318 100644 (file)
--- a/src/osx/carbon/choice.cpp
+++ b/src/osx/carbon/choice.cpp
@@ -44,12 +44,12 @@ public :
 
 wxWidgetImplType* wxWidgetImpl::CreateChoice( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowID WXUNUSED(id), 
                                     wxMenu* menu,
                                     const wxPoint& pos, 
                                     const wxSize& size,
-                                    long style, 
-                                    long extraStylew)
+                                    long WXUNUSED(style), 
+                                    long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size );
 

diff --git a/src/osx/carbon/databrow.cpp b/src/osx/carbon/databrow.cpp
index 4be1a6d40e76effd40e76f618f977bf399540674..e202a9dc9553e74aec6bea0061879e083726bb35 100644 (file)
--- a/src/osx/carbon/databrow.cpp
+++ b/src/osx/carbon/databrow.cpp
@@ -1030,7 +1030,12 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
     } /* switch */
 } /* wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(DataBrowserItemID, DataBrowserItemNotification, DataBrowserItemDataRef) */
 
-void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, DataBrowserItemState state, Rect const* rectangle, SInt16 bitDepth, Boolean colorDevice)
+void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID itemID, 
+                                DataBrowserPropertyID propertyID, 
+                                DataBrowserItemState state, 
+                                Rect const* rectangle, 
+                                SInt16 WXUNUSED(bitDepth), 
+                                Boolean WXUNUSED(colorDevice))
 {
   DataBrowserTableViewColumnIndex columnIndex;
 
@@ -1129,7 +1134,11 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowse
   dataViewCustomRendererPtr->SetDC(NULL);
 } /* wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID, DataBrowserPropertyID, DataBrowserItemState, Rect const*, SInt16, Boolean) */
 
-Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, CFStringRef theString, Rect* maxEditTextRect, Boolean* shrinkToFit)
+Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(DataBrowserItemID WXUNUSED(itemID), 
+                                        DataBrowserPropertyID WXUNUSED(propertyID), 
+                                        CFStringRef WXUNUSED(theString), 
+                                        Rect* WXUNUSED(maxEditTextRect), 
+                                        Boolean* WXUNUSED(shrinkToFit))
 {
   return false;
 } /* wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(DataBrowserItemID, DataBrowserPropertyID, CFStringRef, Rect*, Boolean*) */

diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp
index f4a2c7fdd45004bd87d0a6f0935d77681d322d40..997d24de1ef3fe7dc56f3e4c87d5eac11dc29530 100644 (file)
--- a/src/osx/carbon/dataview.cpp
+++ b/src/osx/carbon/dataview.cpp
@@ -621,7 +621,7 @@ IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer)
 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer
 // ---------------------------------------------------------
-wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
+wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(wxString const& varianttype, wxDataViewCellMode mode, int WXUNUSED(align))
                            :wxDataViewRenderer(varianttype,mode)
 {
 }
@@ -653,7 +653,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer)
 // ---------------------------------------------------------
 // wxDataViewToggleRenderer
 // ---------------------------------------------------------
-wxDataViewToggleRenderer::wxDataViewToggleRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
+wxDataViewToggleRenderer::wxDataViewToggleRenderer(wxString const& varianttype, wxDataViewCellMode mode, int WXUNUSED(align))
                          :wxDataViewRenderer(varianttype,mode)
 {
 }
@@ -674,7 +674,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer,wxDataViewRenderer)
 // ---------------------------------------------------------
 // wxDataViewProgressRenderer
 // ---------------------------------------------------------
-wxDataViewProgressRenderer::wxDataViewProgressRenderer(wxString const& label, wxString const& varianttype, wxDataViewCellMode mode, int align)
+wxDataViewProgressRenderer::wxDataViewProgressRenderer(wxString const& WXUNUSED(label), wxString const& varianttype, wxDataViewCellMode mode, int align)
                            :wxDataViewRenderer(varianttype,mode,align)
 {
 }
@@ -1037,7 +1037,7 @@ wxSize wxDataViewCtrl::DoGetBestSize() const
 }
 
 /*static*/
-wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
+wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
     wxVisualAttributes attr;
 
@@ -1305,7 +1305,7 @@ int wxDataViewCtrl::GetSelections(wxDataViewItemArray& sel) const
   return static_cast<int>(NoOfSelectedItems);
 }
 
-void wxDataViewCtrl::HitTest(wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const
+void wxDataViewCtrl::HitTest(wxPoint const& WXUNUSED(point), wxDataViewItem& item, wxDataViewColumn*& columnPtr) const
 {
   item = wxDataViewItem();
   columnPtr = NULL;

diff --git a/src/osx/carbon/dcclient.cpp b/src/osx/carbon/dcclient.cpp
index 2ade63d5ccd883b0faa1d24c3238b8fd3f6a831b..9c165badcb58fe6796a0af837d26caeb8b0a2729 100644 (file)
--- a/src/osx/carbon/dcclient.cpp
+++ b/src/osx/carbon/dcclient.cpp
@@ -111,9 +111,6 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     HIRect rect;
     CGImageRef image;
     CGContextRef context;
-    void* data;
-
-    size_t bytesPerRow;
 
     HIViewCreateOffscreenImage( handle, 0, &rect, &image);
 

diff --git a/src/osx/carbon/drawer.cpp b/src/osx/carbon/drawer.cpp
index 0af7609fe833e24efd8918501a22f95585e4e785..06ad62df5027b31566b87acff6f776cc999279e1 100644 (file)
--- a/src/osx/carbon/drawer.cpp
+++ b/src/osx/carbon/drawer.cpp
@@ -46,7 +46,7 @@ wxDrawerWindow::~wxDrawerWindow()
 }
 
 bool wxDrawerWindow::Create(wxWindow *parent,
- wxWindowID id, const wxString& title,
+ wxWindowID id, const wxString& WXUNUSED(title),
  wxSize size, wxDirection edge, const wxString& name)
 {
     wxASSERT_MSG(NULL != parent, wxT("wxDrawerWindows must be attached to a parent window."));

diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm
index 93acda991e6ddbf564afa90fa9844b6f9a79c4f7..0fa7163333def6413a3f0fafbe2422be403f0f58 100644 (file)
--- a/src/osx/carbon/fontdlgosx.mm
+++ b/src/osx/carbon/fontdlgosx.mm
@@ -68,8 +68,8 @@
     wxCFStringRef cfOkString( wxT("OK"), wxLocale::GetSystemEncoding() );
     wxCFStringRef cfCancelString( wxT("Cancel"), wxLocale::GetSystemEncoding() );
 
-    NSRect rectCancel = NSMakeRect( 10.0 , 10.0 , 82  , 24 );
-    NSRect rectOK = NSMakeRect( 100.0 , 10.0 , 82  , 24 );
+    NSRect rectCancel = NSMakeRect( (CGFloat) 10.0 , (CGFloat)10.0 , (CGFloat)82  , (CGFloat)24 );
+    NSRect rectOK = NSMakeRect( (CGFloat)100.0 , (CGFloat)10.0 , (CGFloat)82  , (CGFloat)24 );
 
     NSButton* cancelButton = [[NSButton alloc] initWithFrame:rectCancel];
     [cancelButton setTitle:(NSString*)wxCFRetain((CFStringRef)cfCancelString)];

diff --git a/src/osx/carbon/gauge.cpp b/src/osx/carbon/gauge.cpp
index 5a63c43507e946f395738fbc05eb365868500cdf..9cf0d8a62027159e6172e06678341acb8852076e 100644 (file)
--- a/src/osx/carbon/gauge.cpp
+++ b/src/osx/carbon/gauge.cpp
@@ -72,14 +72,14 @@ public :
 
 wxWidgetImplType* wxWidgetImpl::CreateGauge( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowID WXUNUSED(id), 
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     const wxPoint& pos, 
                                     const wxSize& size,
-                                    long style, 
-                                    long extraStyle)
+                                    long WXUNUSED(style), 
+                                    long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
     wxMacGaugeCarbonControl* peer = new wxMacGaugeCarbonControl( wxpeer );

diff --git a/src/osx/carbon/listbox.cpp b/src/osx/carbon/listbox.cpp
index 148167afc03a93d5f598d0e5a144bea3ebe7368e..704a65e0e89fd3a6ce119b636ae00235005ddf54 100644 (file)
--- a/src/osx/carbon/listbox.cpp
+++ b/src/osx/carbon/listbox.cpp
@@ -31,12 +31,12 @@
 // ============================================================================
 
 wxWidgetImplType* wxWidgetImpl::CreateListBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowMac* WXUNUSED(parent), 
+                                    wxWindowID WXUNUSED(id), 
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 
-                                    long extraStyle)
+                                    long WXUNUSED(extraStyle))
 {
     wxMacDataBrowserListControl* control = new wxMacDataBrowserListControl( wxpeer, pos, size, style );
     // TODO CHECK control->SetClientDataType( m_clientDataItemsType );

diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp
index 58acffcf18211867cffdba97e95879e6fecbcd83..915fd58aefd7abd492ce89b2ecf365075044184a 100644 (file)
--- a/src/osx/carbon/listctrl_mac.cpp
+++ b/src/osx/carbon/listctrl_mac.cpp
@@ -1385,7 +1385,7 @@ wxRect wxListCtrl::GetViewRect() const
     return rect;
 }
 
-bool wxListCtrl::GetSubItemRect( long item, long subItem, wxRect& rect, int code ) const
+bool wxListCtrl::GetSubItemRect( long item, long WXUNUSED(subItem), wxRect& rect, int code ) const
 {
     if (m_genericImpl)
         return m_genericImpl->GetItemRect(item, rect, code);

diff --git a/src/osx/carbon/nonownedwnd.cpp b/src/osx/carbon/nonownedwnd.cpp
index 4587682f13d3f01a2cd5d166c05747908830296f..179f6b49971dbaf333682f0c2da18752febd6b62 100644 (file)
--- a/src/osx/carbon/nonownedwnd.cpp
+++ b/src/osx/carbon/nonownedwnd.cpp
@@ -1181,7 +1181,7 @@ void wxNonOwnedWindowCarbonImpl::Create(
     const wxPoint& pos,
     const wxSize& size,
     long style, long extraStyle, 
-    const wxString& name )
+    const wxString& WXUNUSED(name) )
 {
 
     OSStatus err = noErr ;

diff --git a/src/osx/carbon/notebmac.cpp b/src/osx/carbon/notebmac.cpp
index 6119fbde1e41d4ccd166515c8f73a2ab15151d18..560831901c15c1db711c92f6f4587d966c1c1a24 100644 (file)
--- a/src/osx/carbon/notebmac.cpp
+++ b/src/osx/carbon/notebmac.cpp
@@ -32,11 +32,11 @@
 
 wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowID WXUNUSED(id), 
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 
-                                    long extraStyle)
+                                    long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
 

diff --git a/src/osx/carbon/radiobut.cpp b/src/osx/carbon/radiobut.cpp
index 38730a0b271d116517d86a2abbe2ff9416b975a9..61218e28fe21a7860cea8cff35f3a6e56fdadd5a 100644 (file)
--- a/src/osx/carbon/radiobut.cpp
+++ b/src/osx/carbon/radiobut.cpp
@@ -18,12 +18,12 @@
 
 wxWidgetImplType* wxWidgetImpl::CreateRadioButton( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxString& label,
+                                    wxWindowID WXUNUSED(id), 
+                                    const wxString& WXUNUSED(label),
                                     const wxPoint& pos, 
                                     const wxSize& size,
-                                    long style, 
-                                    long extraStyle) 
+                                    long WXUNUSED(style), 
+                                    long WXUNUSED(extraStyle)) 
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;

diff --git a/src/osx/carbon/scrolbar.cpp b/src/osx/carbon/scrolbar.cpp
index 6b9f0fc37c3786ecfaf4e5af52d5d2c349d6853f..c5ccacbb6ebc23eeb650486a035aa325106c35fe 100644 (file)
--- a/src/osx/carbon/scrolbar.cpp
+++ b/src/osx/carbon/scrolbar.cpp
@@ -38,11 +38,11 @@ protected:
 
 wxWidgetImplType* wxWidgetImpl::CreateScrollBar( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowID WXUNUSED(id), 
                                     const wxPoint& pos, 
                                     const wxSize& size,
-                                    long style, 
-                                    long extraStyle)
+                                    long WXUNUSED(style), 
+                                    long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
 

diff --git a/src/osx/carbon/slider.cpp b/src/osx/carbon/slider.cpp
index 38daf07216d5f5e6d5fb6251a18e88c7219025d6..11d2301592039d1da8c7a5370ac6f726548c0d38 100644 (file)
--- a/src/osx/carbon/slider.cpp
+++ b/src/osx/carbon/slider.cpp
@@ -18,14 +18,14 @@
 
 wxWidgetImplType* wxWidgetImpl::CreateSlider( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowID WXUNUSED(id), 
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 
-                                    long extraStyle)
+                                    long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
     int tickMarks = 0;

diff --git a/src/osx/carbon/spinbutt.cpp b/src/osx/carbon/spinbutt.cpp
index 219d9f5c1b6e783d146c236c7a175ea995ed1238..9c45ad494b6ed2adfa7471902dfbae1c20b70aab 100644 (file)
--- a/src/osx/carbon/spinbutt.cpp
+++ b/src/osx/carbon/spinbutt.cpp
@@ -19,14 +19,14 @@
 
 wxWidgetImplType* wxWidgetImpl::CreateSpinButton( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowID WXUNUSED(id), 
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     const wxPoint& pos, 
                                     const wxSize& size,
-                                    long style, 
-                                    long extraStyle)
+                                    long WXUNUSED(style), 
+                                    long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size );
 

diff --git a/src/osx/carbon/srchctrl.cpp b/src/osx/carbon/srchctrl.cpp
index 4d93796aaa84b8ec4e3dfed42073699cd576a8b7..099b462873699743daddf52d195fc9fd42c9adf4 100644 (file)
--- a/src/osx/carbon/srchctrl.cpp
+++ b/src/osx/carbon/srchctrl.cpp
@@ -66,7 +66,7 @@ static const EventTypeSpec eventList[] =
 // implementation
 // ============================================================================
 
-static pascal OSStatus wxMacSearchControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus wxMacSearchControlEventHandler( EventHandlerCallRef WXUNUSED(handler) , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
 
@@ -205,13 +205,13 @@ bool wxMacSearchFieldControl::SetFocus()
 }
 
 wxWidgetImplType* wxWidgetImpl::CreateSearchControl( wxTextCtrl* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowMac* WXUNUSED(parent), 
+                                    wxWindowID WXUNUSED(id), 
                                     const wxString& str,
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 
-                                    long extraStyle)
+                                    long WXUNUSED(extraStyle))
 {
     wxMacControl* peer = new wxMacSearchFieldControl( wxpeer , str , pos , size , style );
 

diff --git a/src/osx/carbon/statbox.cpp b/src/osx/carbon/statbox.cpp
index d6ac0a91e74fa56de36d1b33d39b9f96cc9ee92a..173b4212ca49e201630f12a08d978f5b2aacaf68 100644 (file)
--- a/src/osx/carbon/statbox.cpp
+++ b/src/osx/carbon/statbox.cpp
@@ -18,12 +18,12 @@
 
 wxWidgetImplType* wxWidgetImpl::CreateGroupBox( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxString& label,
+                                    wxWindowID WXUNUSED(id), 
+                                    const wxString& WXUNUSED(label),
                                     const wxPoint& pos, 
                                     const wxSize& size,
-                                    long style, 
-                                    long extraStyle)
+                                    long WXUNUSED(style), 
+                                    long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
 

diff --git a/src/osx/carbon/statlmac.cpp b/src/osx/carbon/statlmac.cpp
index 4f97dba28bd21b4c0f3310376abec18b350f5f04..77af6bb86eb887ec91d80a15a50cc33ed30ed9cb 100644 (file)
--- a/src/osx/carbon/statlmac.cpp
+++ b/src/osx/carbon/statlmac.cpp
@@ -39,11 +39,11 @@
 
 wxWidgetImplType* wxWidgetImpl::CreateStaticLine( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowID WXUNUSED(id), 
                                     const wxPoint& pos, 
                                     const wxSize& size,
-                                    long style, 
-                                    long extraStyle) 
+                                    long WXUNUSED(style), 
+                                    long WXUNUSED(extraStyle)) 
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;

diff --git a/src/osx/carbon/stattext.cpp b/src/osx/carbon/stattext.cpp
index 03eb2a00ad4b4f06913a1087a2e26d6817de89dd..14b10a381238d3a54bec268f4a6478424e5866e2 100644 (file)
--- a/src/osx/carbon/stattext.cpp
+++ b/src/osx/carbon/stattext.cpp
@@ -103,12 +103,12 @@ wxSize wxStaticText::DoGetBestSize() const
 
 wxWidgetImplType* wxWidgetImpl::CreateStaticText( wxWindowMac* wxpeer,
                                     wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxString& label,
+                                    wxWindowID WXUNUSED(id),
+                                    const wxString& WXUNUSED(label),
                                     const wxPoint& pos,
                                     const wxSize& size,
                                     long style,
-                                    long extraStyle)
+                                    long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer, pos, size );
 

diff --git a/src/osx/carbon/textctrl.cpp b/src/osx/carbon/textctrl.cpp
index 1949980f8f3a5c64a0cf5e85b337602e7119f7cf..bf54b621eb83527521602b5a2a9591ccf502ebe6 100644 (file)
--- a/src/osx/carbon/textctrl.cpp
+++ b/src/osx/carbon/textctrl.cpp
@@ -362,13 +362,13 @@ private :
 };
 
 wxWidgetImplType* wxWidgetImpl::CreateTextControl( wxTextCtrl* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowMac* WXUNUSED(parent), 
+                                    wxWindowID WXUNUSED(id), 
                                     const wxString& str,
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 
-                                    long extraStyle)
+                                    long WXUNUSED(extraStyle))
 {
     bool forceMLTE = false ;
 

diff --git a/src/osx/carbon/tglbtn.cpp b/src/osx/carbon/tglbtn.cpp
index 9682aa306eefec8621650346a62f00f0324a90cd..51feb614024a320795f77e49a129cee97f85c4a2 100644 (file)
--- a/src/osx/carbon/tglbtn.cpp
+++ b/src/osx/carbon/tglbtn.cpp
@@ -28,12 +28,12 @@
 
 wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxString& label,
+                                    wxWindowID WXUNUSED(id), 
+                                    const wxString& WXUNUSED(label),
                                     const wxPoint& pos, 
                                     const wxSize& size,
-                                    long style, 
-                                    long extraStyle)
+                                    long WXUNUSED(style), 
+                                    long WXUNUSED(extraStyle))
 {
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     
@@ -45,12 +45,12 @@ wxWidgetImplType* wxWidgetImpl::CreateToggleButton( wxWindowMac* wxpeer,
     
 wxWidgetImplType* wxWidgetImpl::CreateBitmapToggleButton( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
-                                    wxWindowID id, 
+                                    wxWindowID WXUNUSED(id), 
                                     const wxBitmap& label,
                                     const wxPoint& pos, 
                                     const wxSize& size,
-                                    long style, 
-                                    long extraStyle)
+                                    long WXUNUSED(style), 
+                                    long WXUNUSED(extraStyle))
 {    
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
     wxMacControl* peer = new wxMacControl(wxpeer) ;

diff --git a/src/osx/carbon/toolbar.cpp b/src/osx/carbon/toolbar.cpp
index 43248edb9c71ea358711df81c0c5c20b120b5d98..170c37baaa673bb8b8ef6919cc31a4355a1be948 100644 (file)
--- a/src/osx/carbon/toolbar.cpp
+++ b/src/osx/carbon/toolbar.cpp
@@ -1523,7 +1523,7 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *WXUNUSED(t), bool WXUNUSED(enabl
     // everything already done in the tool's implementation
 }
 
-void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
+void wxToolBar::DoToggleTool(wxToolBarToolBase *WXUNUSED(t), bool WXUNUSED(toggle))
 {
     // everything already done in the tool's implementation
 }

diff --git a/src/osx/carbon/window.cpp b/src/osx/carbon/window.cpp
index b1293cfa17480cd14e096ca066c354b2d7d7ec0f..875b62a41e969be8ba75dcb24af4d13ab4908b04 100644 (file)
--- a/src/osx/carbon/window.cpp
+++ b/src/osx/carbon/window.cpp
@@ -822,8 +822,13 @@ pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode p
 }
 wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ;
 
-wxWidgetImplType* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-                            long style, long extraStyle)
+wxWidgetImplType* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, 
+                            wxWindowMac* WXUNUSED(parent), 
+                            wxWindowID WXUNUSED(id), 
+                            const wxPoint& pos, 
+                            const wxSize& size,
+                            long WXUNUSED(style), 
+                            long WXUNUSED(extraStyle))
 {
     OSStatus err = noErr;
     Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;