From a4fec5b41e2109e2c4822d3015aa0e442754bfbb Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 4 Apr 2009 09:05:59 +0000 Subject: [PATCH] fixing unused param warning git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/bmpbuttn.cpp | 4 ++-- src/osx/carbon/button.cpp | 10 +++++----- src/osx/carbon/checkbox.cpp | 6 +++--- src/osx/carbon/choice.cpp | 6 +++--- src/osx/carbon/databrow.cpp | 13 +++++++++++-- src/osx/carbon/dataview.cpp | 10 +++++----- src/osx/carbon/dcclient.cpp | 3 --- src/osx/carbon/drawer.cpp | 2 +- src/osx/carbon/fontdlgosx.mm | 4 ++-- src/osx/carbon/gauge.cpp | 6 +++--- src/osx/carbon/listbox.cpp | 6 +++--- src/osx/carbon/listctrl_mac.cpp | 2 +- src/osx/carbon/nonownedwnd.cpp | 2 +- src/osx/carbon/notebmac.cpp | 4 ++-- src/osx/carbon/radiobut.cpp | 8 ++++---- src/osx/carbon/scrolbar.cpp | 6 +++--- src/osx/carbon/slider.cpp | 4 ++-- src/osx/carbon/spinbutt.cpp | 6 +++--- src/osx/carbon/srchctrl.cpp | 8 ++++---- src/osx/carbon/statbox.cpp | 8 ++++---- src/osx/carbon/statlmac.cpp | 6 +++--- src/osx/carbon/stattext.cpp | 6 +++--- src/osx/carbon/textctrl.cpp | 6 +++--- src/osx/carbon/tglbtn.cpp | 14 +++++++------- src/osx/carbon/toolbar.cpp | 2 +- src/osx/carbon/window.cpp | 9 +++++++-- 26 files changed, 86 insertions(+), 75 deletions(-) diff --git a/src/osx/carbon/bmpbuttn.cpp b/src/osx/carbon/bmpbuttn.cpp index 2b5eddec7c..1ef6688d46 100644 --- 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 955a27382f..14ff0c1f55 100644 --- 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 f31d0413fc..3dff92a7d5 100644 --- 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 182d21f3e1..1985f81205 100644 --- 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 4be1a6d40e..e202a9dc95 100644 --- 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 f4a2c7fdd4..997d24de1e 100644 --- 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(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 2ade63d5cc..9c165badcb 100644 --- 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 0af7609fe8..06ad62df50 100644 --- 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 93acda991e..0fa7163333 100644 --- 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 5a63c43507..9cf0d8a620 100644 --- 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 148167afc0..704a65e0e8 100644 --- 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 58acffcf18..915fd58aef 100644 --- 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 4587682f13..179f6b4997 100644 --- 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 6119fbde1e..560831901c 100644 --- 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 38730a0b27..61218e28fe 100644 --- 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 6b9f0fc37c..c5ccacbb6e 100644 --- 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 38daf07216..11d2301592 100644 --- 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 219d9f5c1b..9c45ad494b 100644 --- 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 4d93796aaa..099b462873 100644 --- 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 d6ac0a91e7..173b4212ca 100644 --- 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 4f97dba28b..77af6bb86e 100644 --- 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 03eb2a00ad..14b10a3812 100644 --- 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 1949980f8f..bf54b621eb 100644 --- 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 9682aa306e..51feb61402 100644 --- 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 43248edb9c..170c37baaa 100644 --- 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 b1293cfa17..875b62a41e 100644 --- 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 ) ; -- 2.47.2