fixing unused params

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

diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index 957bd063ff0c0845a14867bc804ffbbb2ed2a8a1..88db0671143679db07df1b317b2890e75eac4c58 100644 (file)
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -368,7 +368,7 @@ wxBitmap wxOSXCreateSystemBitmap(const wxString& name, const wxString &client, c
 
 #if wxOSX_USE_COCOA
 
 
 #if wxOSX_USE_COCOA
 

-wxBitmap wxOSXCreateSystemBitmap(const wxString& name, const wxString &client, const wxSize& size)
+wxBitmap wxOSXCreateSystemBitmap(const wxString& name, const wxString &WXUNUSED(client), const wxSize& WXUNUSED(size))

 {
     wxCFStringRef cfname(name);
     wxCFRef<CGImageRef> image( wxOSXCreateCGImageFromNSImage([NSImage imageNamed:cfname.AsNSString()]) );
 {
     wxCFStringRef cfname(name);
     wxCFRef<CGImageRef> image( wxOSXCreateCGImageFromNSImage([NSImage imageNamed:cfname.AsNSString()]) );

diff --git a/src/osx/cocoa/combobox.mm b/src/osx/cocoa/combobox.mm
index 3ae05278d7f86cab45809dc49266882988cdc2a5..506faf71fda7df2f82db2010d1e6537aed71fe4b 100644 (file)
--- a/src/osx/cocoa/combobox.mm
+++ b/src/osx/cocoa/combobox.mm
@@ -168,7 +168,7 @@ int wxNSComboBoxControl::FindString(const wxString& text) const
 wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxComboBox* wxpeer, 
                                     wxWindowMac* WXUNUSED(parent), 
                                     wxWindowID WXUNUSED(id), 
 wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxComboBox* wxpeer, 
                                     wxWindowMac* WXUNUSED(parent), 
                                     wxWindowID WXUNUSED(id), 

-                                    wxMenu* menu,
+                                    wxMenu* WXUNUSED(menu),

                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     long style, 

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 7243ab2e030027ade28b80b157989dd709cde150..452c36350b68eb14cd9477f71c38e8d7edf0061a 100644 (file)
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -494,6 +494,9 @@ outlineView:(NSOutlineView*)outlineView
     acceptDrop:(id<NSDraggingInfo>)info
     item:(id)item childIndex:(NSInteger)index
 {
     acceptDrop:(id<NSDraggingInfo>)info
     item:(id)item childIndex:(NSInteger)index
 {

+    wxUnusedVar(outlineView);
+    wxUnusedVar(index);
+    

     NSArray* supportedTypes(
         [NSArray arrayWithObjects:DataViewPboardType,NSStringPboardType,nil]
     );
     NSArray* supportedTypes(
         [NSArray arrayWithObjects:DataViewPboardType,NSStringPboardType,nil]
     );


@@ -609,6 +612,8 @@ outlineView:(NSOutlineView*)outlineView
     child:(NSInteger)index
     ofItem:(id)item
 {
     child:(NSInteger)index
     ofItem:(id)item
 {

+    wxUnusedVar(outlineView);
+

     if ((item == currentParentItem) &&
             (index < ((NSInteger) [self getChildCount])))
         return [self getChild:index];
     if ((item == currentParentItem) &&
             (index < ((NSInteger) [self getChildCount])))
         return [self getChild:index];


@@ -625,12 +630,16 @@ outlineView:(NSOutlineView*)outlineView
 
 -(BOOL) outlineView:(NSOutlineView*)outlineView isItemExpandable:(id)item
 {
 
 -(BOOL) outlineView:(NSOutlineView*)outlineView isItemExpandable:(id)item
 {

+    wxUnusedVar(outlineView);
+

     wxCHECK_MSG( model, 0, "Valid model in data source does not exist." );
     return model->IsContainer(wxDataViewItemFromItem(item));
 }
 
 -(NSInteger) outlineView:(NSOutlineView*)outlineView numberOfChildrenOfItem:(id)item
 {
     wxCHECK_MSG( model, 0, "Valid model in data source does not exist." );
     return model->IsContainer(wxDataViewItemFromItem(item));
 }
 
 -(NSInteger) outlineView:(NSOutlineView*)outlineView numberOfChildrenOfItem:(id)item
 {

+    wxUnusedVar(outlineView);
+

     NSInteger noOfChildren;
 
     wxDataViewItemArray dataViewChildren;
     NSInteger noOfChildren;
 
     wxDataViewItemArray dataViewChildren;


@@ -650,6 +659,8 @@ outlineView:(NSOutlineView*)outlineView
     objectValueForTableColumn:(NSTableColumn*)tableColumn
     byItem:(id)item
 {
     objectValueForTableColumn:(NSTableColumn*)tableColumn
     byItem:(id)item
 {

+    wxUnusedVar(outlineView);
+

     wxCHECK_MSG( model, nil, "Valid model in data source does not exist." );
 
     wxDataViewColumn* col(static_cast<wxDataViewColumn*>([[tableColumn identifier] pointer]));
     wxCHECK_MSG( model, nil, "Valid model in data source does not exist." );
 
     wxDataViewColumn* col(static_cast<wxDataViewColumn*>([[tableColumn identifier] pointer]));


@@ -673,6 +684,8 @@ outlineView:(NSOutlineView*)outlineView
     forTableColumn:(NSTableColumn*)tableColumn
     byItem:(id)item
 {
     forTableColumn:(NSTableColumn*)tableColumn
     byItem:(id)item
 {

+    wxUnusedVar(outlineView);
+

     wxDataViewColumn* col(static_cast<wxDataViewColumn*>([[tableColumn identifier] pointer]));
 
     col->GetRenderer()->
     wxDataViewColumn* col(static_cast<wxDataViewColumn*>([[tableColumn identifier] pointer]));
 
     col->GetRenderer()->


@@ -681,6 +694,8 @@ outlineView:(NSOutlineView*)outlineView
 
 -(void) outlineView:(NSOutlineView*)outlineView sortDescriptorsDidChange:(NSArray*)oldDescriptors
 {
 
 -(void) outlineView:(NSOutlineView*)outlineView sortDescriptorsDidChange:(NSArray*)oldDescriptors
 {

+    wxUnusedVar(oldDescriptors);
+    

     // Warning: the new sort descriptors are guaranteed to be only of type
     // NSSortDescriptor! Therefore, the sort descriptors for the data source
     // have to be converted.
     // Warning: the new sort descriptors are guaranteed to be only of type
     // NSSortDescriptor! Therefore, the sort descriptors for the data source
     // have to be converted.


@@ -730,6 +745,9 @@ outlineView:(NSOutlineView*)outlineView
 
 -(NSDragOperation) outlineView:(NSOutlineView*)outlineView validateDrop:(id<NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
 {
 
 -(NSDragOperation) outlineView:(NSOutlineView*)outlineView validateDrop:(id<NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
 {

+    wxUnusedVar(outlineView);
+    wxUnusedVar(index);
+

     NSArray* supportedTypes([NSArray arrayWithObjects:DataViewPboardType,NSStringPboardType,nil]);
 
     NSPasteboard* pasteboard([info draggingPasteboard]);
     NSArray* supportedTypes([NSArray arrayWithObjects:DataViewPboardType,NSStringPboardType,nil]);
 
     NSPasteboard* pasteboard([info draggingPasteboard]);


@@ -827,6 +845,8 @@ outlineView:(NSOutlineView*)outlineView
 
 -(BOOL) outlineView:(NSOutlineView*)outlineView writeItems:(NSArray*)writeItems toPasteboard:(NSPasteboard*)pasteboard
 {
 
 -(BOOL) outlineView:(NSOutlineView*)outlineView writeItems:(NSArray*)writeItems toPasteboard:(NSPasteboard*)pasteboard
 {

+    wxUnusedVar(outlineView);
+

     // the pasteboard will be filled up with an array containing the data as
     // returned by the events (including the data type) and a concatenation of
     // text (string) data; the text data will only be put onto the pasteboard
     // the pasteboard will be filled up with an array containing the data as
     // returned by the events (including the data type) and a concatenation of
     // text (string) data; the text data will only be put onto the pasteboard


@@ -1534,6 +1554,8 @@ outlineView:(NSOutlineView*)outlineView
 //
 -(void) actionDoubleClick:(id)sender
 {
 //
 -(void) actionDoubleClick:(id)sender
 {

+    wxUnusedVar(sender);
+

     // actually the documentation (NSTableView 2007-10-31) for doubleAction:
     // and setDoubleAction: seems to be wrong as this action message is always
     // sent whether the cell is editable or not
     // actually the documentation (NSTableView 2007-10-31) for doubleAction:
     // and setDoubleAction: seems to be wrong as this action message is always
     // sent whether the cell is editable or not


@@ -1553,6 +1575,8 @@ outlineView:(NSOutlineView*)outlineView
 //
 -(NSMenu*) menuForEvent:(NSEvent*)theEvent
 {
 //
 -(NSMenu*) menuForEvent:(NSEvent*)theEvent
 {

+    wxUnusedVar(theEvent);
+

     // this method does not do any special menu event handling but only sends
     // an event message; therefore, the user has full control if a context
     // menu should be shown or not
     // this method does not do any special menu event handling but only sends
     // an event message; therefore, the user has full control if a context
     // menu should be shown or not


@@ -1624,6 +1648,8 @@ outlineView:(NSOutlineView*)outlineView
 
 -(BOOL) outlineView:(NSOutlineView*)outlineView shouldCollapseItem:(id)item
 {
 
 -(BOOL) outlineView:(NSOutlineView*)outlineView shouldCollapseItem:(id)item
 {

+    wxUnusedVar(outlineView);
+

     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
     wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,dvc->GetId());
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
     wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,dvc->GetId());


@@ -1640,6 +1666,8 @@ outlineView:(NSOutlineView*)outlineView
 
 -(BOOL) outlineView:(NSOutlineView*)outlineView shouldExpandItem:(id)item
 {
 
 -(BOOL) outlineView:(NSOutlineView*)outlineView shouldExpandItem:(id)item
 {

+    wxUnusedVar(outlineView);
+

     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
     wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,dvc->GetId());
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
     wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,dvc->GetId());


@@ -1656,6 +1684,9 @@ outlineView:(NSOutlineView*)outlineView
 
 -(BOOL) outlineView:(NSOutlineView*)outlineView shouldSelectTableColumn:(NSTableColumn*)tableColumn
 {
 
 -(BOOL) outlineView:(NSOutlineView*)outlineView shouldSelectTableColumn:(NSTableColumn*)tableColumn
 {

+    wxUnusedVar(tableColumn);
+    wxUnusedVar(outlineView);
+

     return NO;
 }
 
     return NO;
 }
 


@@ -1664,6 +1695,8 @@ outlineView:(NSOutlineView*)outlineView
     forTableColumn:(NSTableColumn*)tableColumn
     item:(id)item
 {
     forTableColumn:(NSTableColumn*)tableColumn
     item:(id)item
 {

+    wxUnusedVar(outlineView);
+

     wxDataViewCtrl * const dvc = implementation->GetDataViewCtrl();
     wxDataViewModel * const model = dvc->GetModel();
 
     wxDataViewCtrl * const dvc = implementation->GetDataViewCtrl();
     wxDataViewModel * const model = dvc->GetModel();
 


@@ -1749,6 +1782,8 @@ outlineView:(NSOutlineView*)outlineView
 
 -(void) outlineViewSelectionDidChange:(NSNotification*)notification
 {
 
 -(void) outlineViewSelectionDidChange:(NSNotification*)notification
 {

+    wxUnusedVar(notification);
+

     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
     wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED,dvc->GetId());
     wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
 
     wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED,dvc->GetId());


@@ -2156,6 +2191,8 @@ bool wxCocoaDataViewControl::Remove(const wxDataViewItem& parent, const wxDataVi
 
 bool wxCocoaDataViewControl::Update(const wxDataViewColumn *columnPtr)
 {
 
 bool wxCocoaDataViewControl::Update(const wxDataViewColumn *columnPtr)
 {

+    wxUnusedVar(columnPtr);
+    

     return false;
 }
 
     return false;
 }
 


@@ -2966,6 +3003,8 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer(const wxString& label,
                                                        int align)
     : wxDataViewRenderer(varianttype,mode,align)
 {
                                                        int align)
     : wxDataViewRenderer(varianttype,mode,align)
 {

+    wxUnusedVar(label);
+    

     NSLevelIndicatorCell* cell;
 
     cell = [[NSLevelIndicatorCell alloc] initWithLevelIndicatorStyle:NSContinuousCapacityLevelIndicatorStyle];
     NSLevelIndicatorCell* cell;
 
     cell = [[NSLevelIndicatorCell alloc] initWithLevelIndicatorStyle:NSContinuousCapacityLevelIndicatorStyle];


@@ -3083,6 +3122,7 @@ void wxDataViewColumn::SetMinWidth(int minWidth)
 
 void wxDataViewColumn::SetReorderable(bool reorderable)
 {
 
 void wxDataViewColumn::SetReorderable(bool reorderable)
 {

+    wxUnusedVar(reorderable);

 }
 
 void wxDataViewColumn::SetHidden(bool hidden)
 }
 
 void wxDataViewColumn::SetHidden(bool hidden)

diff --git a/src/osx/cocoa/msgdlg.mm b/src/osx/cocoa/msgdlg.mm
index 0124d074b49bd11987a586ca87a88446f46501a5..90d6c5363eefa26bfa22a54f8369627fe829200c 100644 (file)
--- a/src/osx/cocoa/msgdlg.mm
+++ b/src/osx/cocoa/msgdlg.mm
@@ -175,7 +175,7 @@ void wxMessageDialog::ShowWindowModal()
     }
 }
 
     }
 }
 

-void wxMessageDialog::ModalFinishedCallback(void* panel, int resultCode)
+void wxMessageDialog::ModalFinishedCallback(void* WXUNUSED(panel), int resultCode)

 {
     int resultbutton = wxID_CANCEL;
     if ( resultCode < NSAlertFirstButtonReturn )
 {
     int resultbutton = wxID_CANCEL;
     if ( resultCode < NSAlertFirstButtonReturn )

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index d479cc6e0d2909f7b2f60649629d20b0433e4dff..316aa67e1e4c577461b8a8d187d8c26953d2856f 100644 (file)
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -308,36 +308,43 @@ extern int wxOSXGetIdFromSelector(SEL action );
 
 - (void)undo:(id)sender 
 {
 
 - (void)undo:(id)sender 
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
 - (void)redo:(id)sender 
 {
     [self triggerMenu:_cmd];
 }
 
 - (void)redo:(id)sender 
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
 - (void)cut:(id)sender 
 {
     [self triggerMenu:_cmd];
 }
 
 - (void)cut:(id)sender 
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
 - (void)copy:(id)sender
 {
     [self triggerMenu:_cmd];
 }
 
 - (void)copy:(id)sender
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
 - (void)paste:(id)sender
 {
     [self triggerMenu:_cmd];
 }
 
 - (void)paste:(id)sender
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
 - (void)delete:(id)sender 
 {
     [self triggerMenu:_cmd];
 }
 
 - (void)delete:(id)sender 
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
 - (void)selectAll:(id)sender 
 {
     [self triggerMenu:_cmd];
 }
 
 - (void)selectAll:(id)sender 
 {

+    wxUnusedVar(sender);

     [self triggerMenu:_cmd];
 }
 
     [self triggerMenu:_cmd];
 }
 

diff --git a/src/osx/cocoa/taskbar.mm b/src/osx/cocoa/taskbar.mm
index 800c52cee2d167588efb090f6a21f8d56ca30f6a..494b59e7a06ec9a24419995d50f53761d0a084e0 100644 (file)
--- a/src/osx/cocoa/taskbar.mm
+++ b/src/osx/cocoa/taskbar.mm
@@ -291,6 +291,8 @@ bool wxTaskBarIconDockImpl::PopupMenu(wxMenu *WXUNUSED(menu))
 @implementation wxNSAppController(wxTaskBarIconNSApplicationDelegateCategory)
 - (NSMenu*)applicationDockMenu:(NSApplication *)sender
 {
 @implementation wxNSAppController(wxTaskBarIconNSApplicationDelegateCategory)
 - (NSMenu*)applicationDockMenu:(NSApplication *)sender
 {

+    wxUnusedVar(sender);
+    

     return wxTaskBarIconDockImpl::OSXGetDockHMenu();
 }
 @end
     return wxTaskBarIconDockImpl::OSXGetDockHMenu();
 }
 @end


@@ -303,6 +305,7 @@ bool wxTaskBarIconDockImpl::PopupMenu(wxMenu *WXUNUSED(menu))
 
 - (void) clickedAction: (id) sender
 {
 
 - (void) clickedAction: (id) sender
 {

+    wxUnusedVar(sender);

     wxMenu *menu = impl->CreatePopupMenu();
     if (menu)
     {
     wxMenu *menu = impl->CreatePopupMenu();
     if (menu)
     {