fixing unused params

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-03-16 10:58:46 +00:00
parent e8fd252ef8
commit e7794cf2fe
6 changed files with 53 additions and 3 deletions

View File

@@ -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); wxCFStringRef cfname(name);
wxCFRef<CGImageRef> image( wxOSXCreateCGImageFromNSImage([NSImage imageNamed:cfname.AsNSString()]) ); wxCFRef<CGImageRef> image( wxOSXCreateCGImageFromNSImage([NSImage imageNamed:cfname.AsNSString()]) );

View File

@@ -168,7 +168,7 @@ int wxNSComboBoxControl::FindString(const wxString& text) const
wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxComboBox* wxpeer, wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxComboBox* wxpeer,
wxWindowMac* WXUNUSED(parent), wxWindowMac* WXUNUSED(parent),
wxWindowID WXUNUSED(id), wxWindowID WXUNUSED(id),
wxMenu* menu, wxMenu* WXUNUSED(menu),
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,

View File

@@ -494,6 +494,9 @@ outlineView:(NSOutlineView*)outlineView
acceptDrop:(id<NSDraggingInfo>)info acceptDrop:(id<NSDraggingInfo>)info
item:(id)item childIndex:(NSInteger)index item:(id)item childIndex:(NSInteger)index
{ {
wxUnusedVar(outlineView);
wxUnusedVar(index);
NSArray* supportedTypes( NSArray* supportedTypes(
[NSArray arrayWithObjects:DataViewPboardType,NSStringPboardType,nil] [NSArray arrayWithObjects:DataViewPboardType,NSStringPboardType,nil]
); );
@@ -609,6 +612,8 @@ outlineView:(NSOutlineView*)outlineView
child:(NSInteger)index child:(NSInteger)index
ofItem:(id)item ofItem:(id)item
{ {
wxUnusedVar(outlineView);
if ((item == currentParentItem) && if ((item == currentParentItem) &&
(index < ((NSInteger) [self getChildCount]))) (index < ((NSInteger) [self getChildCount])))
return [self getChild:index]; 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." ); wxCHECK_MSG( model, 0, "Valid model in data source does not exist." );
return model->IsContainer(wxDataViewItemFromItem(item)); return model->IsContainer(wxDataViewItemFromItem(item));
} }
-(NSInteger) outlineView:(NSOutlineView*)outlineView numberOfChildrenOfItem:(id)item -(NSInteger) outlineView:(NSOutlineView*)outlineView numberOfChildrenOfItem:(id)item
{ {
wxUnusedVar(outlineView);
NSInteger noOfChildren; NSInteger noOfChildren;
wxDataViewItemArray dataViewChildren; wxDataViewItemArray dataViewChildren;
@@ -650,6 +659,8 @@ outlineView:(NSOutlineView*)outlineView
objectValueForTableColumn:(NSTableColumn*)tableColumn objectValueForTableColumn:(NSTableColumn*)tableColumn
byItem:(id)item byItem:(id)item
{ {
wxUnusedVar(outlineView);
wxCHECK_MSG( model, nil, "Valid model in data source does not exist." ); wxCHECK_MSG( model, nil, "Valid model in data source does not exist." );
wxDataViewColumn* col(static_cast<wxDataViewColumn*>([[tableColumn identifier] pointer])); wxDataViewColumn* col(static_cast<wxDataViewColumn*>([[tableColumn identifier] pointer]));
@@ -673,6 +684,8 @@ outlineView:(NSOutlineView*)outlineView
forTableColumn:(NSTableColumn*)tableColumn forTableColumn:(NSTableColumn*)tableColumn
byItem:(id)item byItem:(id)item
{ {
wxUnusedVar(outlineView);
wxDataViewColumn* col(static_cast<wxDataViewColumn*>([[tableColumn identifier] pointer])); wxDataViewColumn* col(static_cast<wxDataViewColumn*>([[tableColumn identifier] pointer]));
col->GetRenderer()-> 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 // Warning: the new sort descriptors are guaranteed to be only of type
// NSSortDescriptor! Therefore, the sort descriptors for the data source // NSSortDescriptor! Therefore, the sort descriptors for the data source
// have to be converted. // 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]); NSArray* supportedTypes([NSArray arrayWithObjects:DataViewPboardType,NSStringPboardType,nil]);
NSPasteboard* pasteboard([info draggingPasteboard]); 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 // 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 // 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 // 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: // actually the documentation (NSTableView 2007-10-31) for doubleAction:
// and setDoubleAction: seems to be wrong as this action message is always // and setDoubleAction: seems to be wrong as this action message is always
// sent whether the cell is editable or not // 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 // 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 // an event message; therefore, the user has full control if a context
// menu should be shown or not // 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(); wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,dvc->GetId()); 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(); wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,dvc->GetId()); 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 forTableColumn:(NSTableColumn*)tableColumn
item:(id)item item:(id)item
{ {
wxUnusedVar(outlineView);
wxDataViewCtrl * const dvc = implementation->GetDataViewCtrl(); wxDataViewCtrl * const dvc = implementation->GetDataViewCtrl();
wxDataViewModel * const model = dvc->GetModel(); 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(); wxDataViewCtrl* const dvc = implementation->GetDataViewCtrl();
wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED,dvc->GetId()); 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) int align)
: wxDataViewRenderer(varianttype,mode,align) : wxDataViewRenderer(varianttype,mode,align)
{ {
wxUnusedVar(label);
NSLevelIndicatorCell* cell; NSLevelIndicatorCell* cell;
cell = [[NSLevelIndicatorCell alloc] initWithLevelIndicatorStyle:NSContinuousCapacityLevelIndicatorStyle]; 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)

View File

@@ -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; int resultbutton = wxID_CANCEL;
if ( resultCode < NSAlertFirstButtonReturn ) if ( resultCode < NSAlertFirstButtonReturn )

View File

@@ -308,36 +308,43 @@ extern int wxOSXGetIdFromSelector(SEL action );
- (void)undo:(id)sender - (void)undo:(id)sender
{ {
wxUnusedVar(sender);
[self triggerMenu:_cmd]; [self triggerMenu:_cmd];
} }
- (void)redo:(id)sender - (void)redo:(id)sender
{ {
wxUnusedVar(sender);
[self triggerMenu:_cmd]; [self triggerMenu:_cmd];
} }
- (void)cut:(id)sender - (void)cut:(id)sender
{ {
wxUnusedVar(sender);
[self triggerMenu:_cmd]; [self triggerMenu:_cmd];
} }
- (void)copy:(id)sender - (void)copy:(id)sender
{ {
wxUnusedVar(sender);
[self triggerMenu:_cmd]; [self triggerMenu:_cmd];
} }
- (void)paste:(id)sender - (void)paste:(id)sender
{ {
wxUnusedVar(sender);
[self triggerMenu:_cmd]; [self triggerMenu:_cmd];
} }
- (void)delete:(id)sender - (void)delete:(id)sender
{ {
wxUnusedVar(sender);
[self triggerMenu:_cmd]; [self triggerMenu:_cmd];
} }
- (void)selectAll:(id)sender - (void)selectAll:(id)sender
{ {
wxUnusedVar(sender);
[self triggerMenu:_cmd]; [self triggerMenu:_cmd];
} }

View File

@@ -291,6 +291,8 @@ bool wxTaskBarIconDockImpl::PopupMenu(wxMenu *WXUNUSED(menu))
@implementation wxNSAppController(wxTaskBarIconNSApplicationDelegateCategory) @implementation wxNSAppController(wxTaskBarIconNSApplicationDelegateCategory)
- (NSMenu*)applicationDockMenu:(NSApplication *)sender - (NSMenu*)applicationDockMenu:(NSApplication *)sender
{ {
wxUnusedVar(sender);
return wxTaskBarIconDockImpl::OSXGetDockHMenu(); return wxTaskBarIconDockImpl::OSXGetDockHMenu();
} }
@end @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(); wxMenu *menu = impl->CreatePopupMenu();
if (menu) if (menu)
{ {