From dba81b3f1c8d5b738fe49dda6ad26117a15eef83 Mon Sep 17 00:00:00 2001 From: "james.k.crook@gmail.com" Date: Sun, 25 Aug 2013 21:51:26 +0000 Subject: [PATCH] Cleanup: Fixed lots of trivial MSVC warnings. --- src/AudacityApp.cpp | 10 +- src/AutoRecovery.cpp | 6 +- src/AutoRecovery.h | 2 +- src/BatchCommandDialog.cpp | 8 +- src/BatchCommands.cpp | 2 +- src/BatchProcessDialog.cpp | 34 +++---- src/Benchmark.cpp | 8 +- src/Dependencies.cpp | 8 +- src/DeviceManager.cpp | 10 +- src/Envelope.cpp | 13 ++- src/FFmpeg.cpp | 8 +- src/FileIO.cpp | 2 +- src/HistoryWindow.cpp | 4 +- src/LabelDialog.cpp | 18 ++-- src/LangChoice.cpp | 2 +- src/Lyrics.cpp | 4 +- src/LyricsWindow.cpp | 4 +- src/Menus.cpp | 2 +- src/MixerBoard.cpp | 16 +-- src/NoteTrack.cpp | 2 +- src/PluginManager.cpp | 2 +- src/Printing.cpp | 2 +- src/Profiler.cpp | 2 +- src/Project.cpp | 16 +-- src/Screenshot.cpp | 138 +++++++++++++------------- src/Shuttle.cpp | 4 +- src/ShuttlePrefs.cpp | 2 +- src/SoundActivatedRecord.cpp | 2 +- src/Spectrum.cpp | 2 +- src/Tags.cpp | 22 ++-- src/TimeTrack.cpp | 2 +- src/TimerRecordDialog.cpp | 14 +-- src/TrackArtist.cpp | 6 +- src/TrackPanel.cpp | 40 ++++---- src/UploadDialog.cpp | 22 ++-- src/WaveTrack.cpp | 2 +- src/blockfile/SilentBlockFile.cpp | 4 +- src/commands/BatchEvalCommand.cpp | 2 +- src/commands/Command.cpp | 6 +- src/commands/CommandSignature.h | 2 +- src/commands/CommandTargets.h | 2 +- src/commands/HelpCommand.cpp | 2 +- src/commands/MessageCommand.cpp | 2 +- src/commands/PreferenceCommands.cpp | 4 +- src/effects/Amplify.cpp | 10 +- src/effects/ChangeSpeed.cpp | 2 +- src/effects/ClickRemoval.cpp | 10 +- src/effects/Compressor.cpp | 6 +- src/effects/Contrast.cpp | 12 +-- src/effects/DtmfGen.cpp | 10 +- src/effects/Echo.cpp | 2 +- src/effects/Effect.cpp | 4 +- src/effects/Equalization.cpp | 60 +++++------ src/effects/Noise.cpp | 4 +- src/effects/NoiseRemoval.cpp | 28 +++--- src/effects/Normalize.cpp | 4 +- src/effects/Paulstretch.cpp | 4 +- src/effects/Phaser.cpp | 26 ++--- src/effects/Repair.cpp | 2 +- src/effects/Repeat.cpp | 4 +- src/effects/Silence.cpp | 4 +- src/effects/TimeScale.cpp | 18 ++-- src/effects/ToneGen.cpp | 8 +- src/effects/TruncSilence.cpp | 4 +- src/effects/VST/VSTEffect.cpp | 24 ++--- src/effects/Wahwah.cpp | 22 ++-- src/effects/nyquist/Nyquist.cpp | 2 +- src/export/Export.cpp | 30 +++--- src/export/ExportCL.cpp | 12 +-- src/export/ExportFFmpegDialogs.cpp | 28 +++--- src/export/ExportFLAC.cpp | 6 +- src/export/ExportMP2.cpp | 8 +- src/export/ExportMP3.cpp | 22 ++-- src/export/ExportMultiple.cpp | 28 +++--- src/export/ExportOGG.cpp | 6 +- src/import/ImportFFmpeg.cpp | 2 +- src/import/ImportFLAC.cpp | 6 +- src/import/ImportLOF.cpp | 8 +- src/import/ImportMP3.cpp | 10 +- src/import/ImportOGG.cpp | 2 +- src/import/ImportPCM.cpp | 2 +- src/import/RawAudioGuess.cpp | 2 + src/prefs/DevicePrefs.cpp | 2 +- src/prefs/DirectoriesPrefs.cpp | 2 +- src/prefs/ExtImportPrefs.cpp | 18 ++-- src/prefs/KeyConfigPrefs.cpp | 19 ++-- src/prefs/LibraryPrefs.cpp | 8 +- src/prefs/ThemePrefs.cpp | 12 +-- src/toolbars/MeterToolBar.cpp | 2 +- src/toolbars/MixerToolBar.cpp | 2 +- src/toolbars/SelectionBar.cpp | 12 +-- src/toolbars/ToolBar.cpp | 4 +- src/toolbars/ToolDock.cpp | 6 +- src/toolbars/ToolManager.cpp | 6 +- src/toolbars/TranscriptionToolBar.cpp | 26 ++--- src/widgets/AButton.cpp | 12 +-- src/widgets/ASlider.cpp | 16 +-- src/widgets/ErrorDialog.cpp | 4 +- src/widgets/ExpandingToolBar.cpp | 12 +-- src/widgets/Grabber.cpp | 6 +- src/widgets/Grid.cpp | 4 +- src/widgets/ImageRoll.cpp | 6 +- src/widgets/LinkingHtmlWindow.cpp | 6 +- src/widgets/Meter.cpp | 34 +++---- src/widgets/ProgressDialog.cpp | 4 +- src/widgets/Ruler.cpp | 4 + src/widgets/TimeTextCtrl.cpp | 4 +- src/widgets/Warning.cpp | 2 +- 108 files changed, 571 insertions(+), 569 deletions(-) diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index e420bafcc..0fbdecf32 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -589,10 +589,10 @@ public: { }; - bool OnExecute(const wxString & topic, + bool OnExecute(const wxString & WXUNUSED(topic), wxChar *data, - int size, - wxIPCFormat format) + int WXUNUSED(size), + wxIPCFormat WXUNUSED(format)) { if (!gInited) { return false; @@ -826,7 +826,7 @@ bool AudacityApp::MRUOpen(wxString fullPathStr) { return(true); } -void AudacityApp::OnMRUClear(wxCommandEvent& event) +void AudacityApp::OnMRUClear(wxCommandEvent& WXUNUSED(event)) { mRecentFiles->Clear(); } @@ -847,7 +847,7 @@ void AudacityApp::OnMRUFile(wxCommandEvent& event) { mRecentFiles->RemoveFileFromHistory(n); } -void AudacityApp::OnTimer(wxTimerEvent& event) +void AudacityApp::OnTimer(wxTimerEvent& WXUNUSED(event)) { // Check if a warning for missing aliased files should be displayed if (ShouldShowMissingAliasedFileWarning()) { diff --git a/src/AutoRecovery.cpp b/src/AutoRecovery.cpp index 90d14f6db..53e6617d0 100644 --- a/src/AutoRecovery.cpp +++ b/src/AutoRecovery.cpp @@ -119,12 +119,12 @@ void AutoRecoveryDialog::PopulateList() mFileList->SetColumnWidth(0, wxLIST_AUTOSIZE); } -void AutoRecoveryDialog::OnQuitAudacity(wxCommandEvent &evt) +void AutoRecoveryDialog::OnQuitAudacity(wxCommandEvent & WXUNUSED(event)) { EndModal(ID_QUIT_AUDACITY); } -void AutoRecoveryDialog::OnRecoverNone(wxCommandEvent &evt) +void AutoRecoveryDialog::OnRecoverNone(wxCommandEvent & WXUNUSED(event)) { int ret = wxMessageBox( _("Are you sure you don't want to recover any projects?\nThey can't be recovered later."), @@ -134,7 +134,7 @@ void AutoRecoveryDialog::OnRecoverNone(wxCommandEvent &evt) EndModal(ID_RECOVER_NONE); } -void AutoRecoveryDialog::OnRecoverAll(wxCommandEvent &evt) +void AutoRecoveryDialog::OnRecoverAll(wxCommandEvent & WXUNUSED(event)) { EndModal(ID_RECOVER_ALL); } diff --git a/src/AutoRecovery.h b/src/AutoRecovery.h index 47dc83ee5..352a49eda 100644 --- a/src/AutoRecovery.h +++ b/src/AutoRecovery.h @@ -43,7 +43,7 @@ public: virtual XMLTagHandler *HandleXMLChild(const wxChar *tag); // This class only knows reading tags - virtual void WriteXML(XMLWriter &xmlFile) { wxASSERT(false); } + virtual void WriteXML(XMLWriter & WXUNUSED(xmlFile)) { wxASSERT(false); } private: AudacityProject* mProject; diff --git a/src/BatchCommandDialog.cpp b/src/BatchCommandDialog.cpp index b0268e1ae..955cdd2e6 100644 --- a/src/BatchCommandDialog.cpp +++ b/src/BatchCommandDialog.cpp @@ -146,18 +146,18 @@ void BatchCommandDialog::ValidateChoices() { } -void BatchCommandDialog::OnChoice(wxCommandEvent &event) +void BatchCommandDialog::OnChoice(wxCommandEvent & WXUNUSED(event)) { } -void BatchCommandDialog::OnOk(wxCommandEvent &event) +void BatchCommandDialog::OnOk(wxCommandEvent & WXUNUSED(event)) { mSelectedCommand = mCommand->GetValue().Strip(wxString::both); mSelectedParameters = mParameters->GetValue().Strip(wxString::trailing); EndModal(true); } -void BatchCommandDialog::OnCancel(wxCommandEvent &event) +void BatchCommandDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) { EndModal(false); } @@ -173,7 +173,7 @@ void BatchCommandDialog::OnItemSelected(wxListEvent &event) mEditParams->Enable( f != NULL ); } -void BatchCommandDialog::OnEditParams(wxCommandEvent &event) +void BatchCommandDialog::OnEditParams(wxCommandEvent & WXUNUSED(event)) { wxString command = mCommand->GetValue(); wxString params = mParameters->GetValue(); diff --git a/src/BatchCommands.cpp b/src/BatchCommands.cpp index 2043ac498..3d4cf9e93 100644 --- a/src/BatchCommands.cpp +++ b/src/BatchCommands.cpp @@ -417,7 +417,7 @@ bool BatchCommands::WriteMp3File( const wxString Name, int bitrate ) // and think again. // ======= IMPORTANT ======== // CLEANSPEECH remnant -bool BatchCommands::ApplySpecialCommand(int iCommand, const wxString command,const wxString params) +bool BatchCommands::ApplySpecialCommand(int WXUNUSED(iCommand), const wxString command,const wxString params) { if (ReportAndSkip(command, params)) return true; diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp index 12c9ce834..ccdf8fdf2 100644 --- a/src/BatchProcessDialog.cpp +++ b/src/BatchProcessDialog.cpp @@ -64,7 +64,7 @@ BatchProcessDialog::BatchProcessDialog(wxWindow * parent): wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { - AudacityProject * p = GetActiveProject(); + //AudacityProject * p = GetActiveProject(); SetLabel(_("Apply Chain")); // Provide visual label SetName(_("Apply Chain")); // Provide audible label @@ -139,7 +139,7 @@ void BatchProcessDialog::PopulateOrExchange(ShuttleGui &S) mChains->SetColumnWidth(0, sz.x); } -void BatchProcessDialog::OnApplyToProject(wxCommandEvent &event) +void BatchProcessDialog::OnApplyToProject(wxCommandEvent & WXUNUSED(event)) { long item = mChains->GetNextItem(-1, wxLIST_NEXT_ALL, @@ -183,7 +183,7 @@ void BatchProcessDialog::OnApplyToProject(wxCommandEvent &event) } } -void BatchProcessDialog::OnApplyToFiles(wxCommandEvent &event) +void BatchProcessDialog::OnApplyToFiles(wxCommandEvent & WXUNUSED(event)) { long item = mChains->GetNextItem(-1, wxLIST_NEXT_ALL, @@ -339,7 +339,7 @@ void BatchProcessDialog::OnApplyToFiles(wxCommandEvent &event) project->OnRemoveTracks(); } -void BatchProcessDialog::OnCancel(wxCommandEvent &event) +void BatchProcessDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) { EndModal(false); } @@ -590,7 +590,7 @@ bool EditChainsDialog::ChangeOK() return true; } /// An item in the chains list has been selected. -void EditChainsDialog::OnChainSelected(wxListEvent &event) +void EditChainsDialog::OnChainSelected(wxListEvent & event) { if (!ChangeOK()) { event.Veto(); @@ -617,13 +617,13 @@ void EditChainsDialog::OnChainSelected(wxListEvent &event) } /// An item in the chains list has been selected. -void EditChainsDialog::OnListSelected(wxListEvent &event) +void EditChainsDialog::OnListSelected(wxListEvent & WXUNUSED(event)) { FitColumns(); } /// The window has been resized. -void EditChainsDialog::OnSize(wxSizeEvent &event) +void EditChainsDialog::OnSize(wxSizeEvent & WXUNUSED(event)) { // Refrsh the layout and re-fit the columns. Layout(); @@ -704,7 +704,7 @@ void EditChainsDialog::OnChainsEndEdit(wxListEvent &event) } /// -void EditChainsDialog::OnAdd(wxCommandEvent &event) +void EditChainsDialog::OnAdd(wxCommandEvent & WXUNUSED(event)) { while (true) { wxTextEntryDialog d(this, @@ -748,7 +748,7 @@ void EditChainsDialog::OnAdd(wxCommandEvent &event) } /// -void EditChainsDialog::OnRemove(wxCommandEvent &event) +void EditChainsDialog::OnRemove(wxCommandEvent & WXUNUSED(event)) { long item = mChains->GetNextItem(-1, wxLIST_NEXT_ALL, @@ -779,7 +779,7 @@ void EditChainsDialog::OnRemove(wxCommandEvent &event) } /// -void EditChainsDialog::OnRename(wxCommandEvent &event) +void EditChainsDialog::OnRename(wxCommandEvent & WXUNUSED(event)) { long item = mChains->GetNextItem(-1, wxLIST_NEXT_ALL, @@ -818,7 +818,7 @@ void EditChainsDialog::OnCommandActivated(wxListEvent &event) } /// -void EditChainsDialog::OnInsert(wxCommandEvent &event) +void EditChainsDialog::OnInsert(wxCommandEvent & WXUNUSED(event)) { long item = mList->GetNextItem(-1, wxLIST_NEXT_ALL, @@ -847,7 +847,7 @@ void EditChainsDialog::OnInsert(wxCommandEvent &event) } /// -void EditChainsDialog::OnDelete(wxCommandEvent &event) +void EditChainsDialog::OnDelete(wxCommandEvent & WXUNUSED(event)) { long item = mList->GetNextItem(-1, wxLIST_NEXT_ALL, @@ -870,7 +870,7 @@ void EditChainsDialog::OnDelete(wxCommandEvent &event) } /// -void EditChainsDialog::OnUp(wxCommandEvent &event) +void EditChainsDialog::OnUp(wxCommandEvent & WXUNUSED(event)) { long item = mList->GetNextItem(-1, wxLIST_NEXT_ALL, @@ -892,7 +892,7 @@ void EditChainsDialog::OnUp(wxCommandEvent &event) } /// -void EditChainsDialog::OnDown(wxCommandEvent &event) +void EditChainsDialog::OnDown(wxCommandEvent & WXUNUSED(event)) { long item = mList->GetNextItem(-1, wxLIST_NEXT_ALL, @@ -914,7 +914,7 @@ void EditChainsDialog::OnDown(wxCommandEvent &event) } /// Select the empty Command chain. -void EditChainsDialog::OnDefaults(wxCommandEvent &event) +void EditChainsDialog::OnDefaults(wxCommandEvent & WXUNUSED(event)) { mBatchCommands.RestoreChain(mActiveChain); @@ -924,7 +924,7 @@ void EditChainsDialog::OnDefaults(wxCommandEvent &event) } /// Send changed values back to Prefs, and update Audacity. -void EditChainsDialog::OnOK(wxCommandEvent &event) +void EditChainsDialog::OnOK(wxCommandEvent & WXUNUSED(event)) { gPrefs->Write(wxT("/Batch/ActiveChain"), mActiveChain); gPrefs->Flush(); @@ -939,7 +939,7 @@ void EditChainsDialog::OnOK(wxCommandEvent &event) } /// -void EditChainsDialog::OnCancel(wxCommandEvent &event) +void EditChainsDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) { if (!ChangeOK()) { return; diff --git a/src/Benchmark.cpp b/src/Benchmark.cpp index 0df79cf88..612a63315 100644 --- a/src/Benchmark.cpp +++ b/src/Benchmark.cpp @@ -144,7 +144,7 @@ BenchmarkDialog::BenchmarkDialog(wxWindow *parent): // WDR: handler implementations for BenchmarkDialog -void BenchmarkDialog::OnClose(wxCommandEvent &event) +void BenchmarkDialog::OnClose(wxCommandEvent & WXUNUSED(event)) { EndModal(0); } @@ -240,7 +240,7 @@ void BenchmarkDialog::MakeBenchmarkDialog() SetSizeHints(GetSize()); } -void BenchmarkDialog::OnSave( wxCommandEvent &event ) +void BenchmarkDialog::OnSave( wxCommandEvent & WXUNUSED(event)) { wxString fName = wxT("benchmark.txt"); @@ -253,7 +253,7 @@ void BenchmarkDialog::OnSave( wxCommandEvent &event ) mText->SaveFile(fName); } -void BenchmarkDialog::OnClear(wxCommandEvent &event) +void BenchmarkDialog::OnClear(wxCommandEvent & WXUNUSED(event)) { mText->Clear(); } @@ -290,7 +290,7 @@ void BenchmarkDialog::FlushPrint() mToPrint = wxT(""); } -void BenchmarkDialog::OnRun( wxCommandEvent &event ) +void BenchmarkDialog::OnRun( wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); diff --git a/src/Dependencies.cpp b/src/Dependencies.cpp index b37d785f9..78af5f481 100644 --- a/src/Dependencies.cpp +++ b/src/Dependencies.cpp @@ -469,19 +469,19 @@ void DependencyDialog::OnSize(wxSizeEvent &evt) wxDialog::OnSize(evt); } -void DependencyDialog::OnNo(wxCommandEvent &evt) +void DependencyDialog::OnNo(wxCommandEvent & WXUNUSED(event)) { SaveFutureActionChoice(); EndModal(wxID_NO); } -void DependencyDialog::OnYes(wxCommandEvent &evt) +void DependencyDialog::OnYes(wxCommandEvent & WXUNUSED(event)) { SaveFutureActionChoice(); EndModal(wxID_YES); } -void DependencyDialog::OnCopySelectedFiles(wxCommandEvent &evt) +void DependencyDialog::OnCopySelectedFiles(wxCommandEvent & WXUNUSED(event)) { AliasedFileArray aliasedFilesToDelete; @@ -504,7 +504,7 @@ void DependencyDialog::OnCopySelectedFiles(wxCommandEvent &evt) } } -void DependencyDialog::OnCancel(wxCommandEvent& evt) +void DependencyDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) { if (mIsSaving) { diff --git a/src/DeviceManager.cpp b/src/DeviceManager.cpp index 9576e0067..05dd9af98 100644 --- a/src/DeviceManager.cpp +++ b/src/DeviceManager.cpp @@ -104,11 +104,11 @@ DeviceSourceMap* DeviceManager::GetDefaultInputDevice(int hostIndex) //Port Audio requires we open the stream with a callback or a lot of devices will fail //as this means open in blocking mode, so we use a dummy one. static int DummyPaStreamCallback( - const void *input, void *output, - unsigned long frameCount, - const PaStreamCallbackTimeInfo* timeInfo, - PaStreamCallbackFlags statusFlags, - void *userData ) + const void *WXUNUSED(input), void * WXUNUSED(output), + unsigned long WXUNUSED(frameCount), + const PaStreamCallbackTimeInfo* WXUNUSED(timeInfo), + PaStreamCallbackFlags WXUNUSED(statusFlags), + void *WXUNUSED(userData) ) { return 0; } diff --git a/src/Envelope.cpp b/src/Envelope.cpp index f15db7516..89dad2602 100644 --- a/src/Envelope.cpp +++ b/src/Envelope.cpp @@ -518,7 +518,7 @@ void Envelope::MarkDragPointForDeletion() } void Envelope::MoveDraggedPoint( wxMouseEvent & event, wxRect & r, - double h, double pps, bool dB, + double WXUNUSED(h), double pps, bool dB, float zoomMin, float zoomMax) { int clip_y = event.m_y - r.y; @@ -555,7 +555,8 @@ void Envelope::MoveDraggedPoint( wxMouseEvent & event, wxRect & r, bool Envelope::HandleDragging( wxMouseEvent & event, wxRect & r, double h, double pps, bool dB, - float zoomMin, float zoomMax, float eMin, float eMax) + float zoomMin, float zoomMax, + float WXUNUSED(eMin), float WXUNUSED(eMax)) { mDirty = true; @@ -580,9 +581,11 @@ bool Envelope::HandleDragging( wxMouseEvent & event, wxRect & r, } // Exit dragging mode and deletes dragged point if neccessary. -bool Envelope::HandleMouseButtonUp( wxMouseEvent & event, wxRect & r, - double h, double pps, bool dB, - float zoomMin, float zoomMax ) +bool Envelope::HandleMouseButtonUp( wxMouseEvent & WXUNUSED(event), wxRect & WXUNUSED(r), + double WXUNUSED(h), + double WXUNUSED(pps), bool WXUNUSED(dB), + float WXUNUSED(zoomMin), + float WXUNUSED(zoomMax) ) { if (mIsDeleting) { delete mEnv[mDragPoint]; diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp index 3a4159d0f..531881944 100644 --- a/src/FFmpeg.cpp +++ b/src/FFmpeg.cpp @@ -117,7 +117,7 @@ void FFmpegStartup() } } -wxString GetFFmpegVersion(wxWindow *parent) +wxString GetFFmpegVersion(wxWindow * WXUNUSED(parent)) { PickFFmpegLibs(); @@ -628,7 +628,7 @@ public: return; } - void OnBrowse(wxCommandEvent & event) + void OnBrowse(wxCommandEvent & WXUNUSED(event)) { wxString question; /* i18n-hint: It's asking for the location of a file, for @@ -649,7 +649,7 @@ public: } } - void OnDownload(wxCommandEvent & event) + void OnDownload(wxCommandEvent & WXUNUSED(event)) { wxString page = wxT("http://manual.audacityteam.org/o/man/faq_installation_and_plug_ins.html#ffdown"); ::OpenInDefaultBrowser(page); @@ -752,7 +752,7 @@ bool FFmpegLibs::FindLibs(wxWindow *parent) return true; } -bool FFmpegLibs::LoadLibs(wxWindow *parent, bool showerr) +bool FFmpegLibs::LoadLibs(wxWindow * WXUNUSED(parent), bool showerr) { #if defined(DISABLE_DYNAMIC_LOADING_FFMPEG) mLibsLoaded = InitLibs(wxEmptyString, showerr); diff --git a/src/FileIO.cpp b/src/FileIO.cpp index e4fada043..21b76dbda 100644 --- a/src/FileIO.cpp +++ b/src/FileIO.cpp @@ -158,7 +158,7 @@ void FileIO::SetCatalogInfo() return; } -void FileIO::SetCatalogInfo(wxUint32 type) +void FileIO::SetCatalogInfo(wxUint32 WXUNUSED(type)) { #ifdef __WXMAC__ if (!mOpen || mFtp != NULL) { diff --git a/src/HistoryWindow.cpp b/src/HistoryWindow.cpp index b93f50db1..a9684ac9b 100644 --- a/src/HistoryWindow.cpp +++ b/src/HistoryWindow.cpp @@ -193,7 +193,7 @@ void HistoryWindow::UpdateLevels() mDiscard->Enable(mSelected > 0); } -void HistoryWindow::OnDiscard(wxCommandEvent &event) +void HistoryWindow::OnDiscard(wxCommandEvent & WXUNUSED(event)) { int i = mLevels->GetValue(); @@ -237,7 +237,7 @@ void HistoryWindow::OnCloseWindow(wxCloseEvent & WXUNUSED(event)) this->Show(false); } -void HistoryWindow::OnSize(wxSizeEvent & event) +void HistoryWindow::OnSize(wxSizeEvent & WXUNUSED(event)) { Layout(); mList->SetColumnWidth(0, mList->GetClientSize().x - mList->GetColumnWidth(1)); diff --git a/src/LabelDialog.cpp b/src/LabelDialog.cpp index 4c762f5e6..2940873ff 100644 --- a/src/LabelDialog.cpp +++ b/src/LabelDialog.cpp @@ -482,7 +482,7 @@ void LabelDialog::OnInsert(wxCommandEvent &event) mGrid->ShowCellEditControl(); } -void LabelDialog::OnRemove(wxCommandEvent &event) +void LabelDialog::OnRemove(wxCommandEvent & WXUNUSED(event)) { int row = mGrid->GetCursorRow(); int col = mGrid->GetCursorColumn(); @@ -513,7 +513,7 @@ void LabelDialog::OnRemove(wxCommandEvent &event) mGrid->SetGridCursor(row, col); } -void LabelDialog::OnImport(wxCommandEvent &event) +void LabelDialog::OnImport(wxCommandEvent & WXUNUSED(event)) { wxString path = gPrefs->Read(wxT("/DefaultOpenPath"),::wxGetCwd()); @@ -558,7 +558,7 @@ void LabelDialog::OnImport(wxCommandEvent &event) } } -void LabelDialog::OnExport(wxCommandEvent &event) +void LabelDialog::OnExport(wxCommandEvent & WXUNUSED(event)) { int cnt = mData.GetCount(); @@ -698,7 +698,7 @@ void LabelDialog::OnCellChange(wxGridEvent &event) return; } -void LabelDialog::OnChangeTrack(wxGridEvent &event, int row, RowData *rd) +void LabelDialog::OnChangeTrack(wxGridEvent & WXUNUSED(event), int row, RowData *rd) { wxString val = mGrid->GetCellValue(row, Col_Track); @@ -732,7 +732,7 @@ void LabelDialog::OnChangeTrack(wxGridEvent &event, int row, RowData *rd) return; } -void LabelDialog::OnChangeLabel(wxGridEvent &event, int row, RowData *rd) +void LabelDialog::OnChangeLabel(wxGridEvent & WXUNUSED(event), int row, RowData *rd) { // Remember the value...no need to repopulate rd->title = mGrid->GetCellValue(row, Col_Label); @@ -740,7 +740,7 @@ void LabelDialog::OnChangeLabel(wxGridEvent &event, int row, RowData *rd) return; } -void LabelDialog::OnChangeStime(wxGridEvent &event, int row, RowData *rd) +void LabelDialog::OnChangeStime(wxGridEvent & WXUNUSED(event), int row, RowData *rd) { // Remember the value...no need to repopulate mGrid->GetCellValue(row, Col_Stime).ToDouble(&rd->stime); @@ -752,7 +752,7 @@ void LabelDialog::OnChangeStime(wxGridEvent &event, int row, RowData *rd) return; } -void LabelDialog::OnChangeEtime(wxGridEvent &event, int row, RowData *rd) +void LabelDialog::OnChangeEtime(wxGridEvent & WXUNUSED(event), int row, RowData *rd) { // Remember the value...no need to repopulate mGrid->GetCellValue(row, Col_Etime).ToDouble(&rd->etime); @@ -764,7 +764,7 @@ void LabelDialog::OnChangeEtime(wxGridEvent &event, int row, RowData *rd) return; } -void LabelDialog::OnOK(wxCommandEvent &event) +void LabelDialog::OnOK(wxCommandEvent & WXUNUSED(event)) { if (mGrid->IsCellEditControlShown()) { mGrid->SaveEditControlValue(); @@ -780,7 +780,7 @@ void LabelDialog::OnOK(wxCommandEvent &event) return; } -void LabelDialog::OnCancel(wxCommandEvent &event) +void LabelDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) { if (mGrid->IsCellEditControlShown()) { mGrid->GetCellEditor(mGrid->GetGridCursorRow(), diff --git a/src/LangChoice.cpp b/src/LangChoice.cpp index 5a4effe84..b70a6f787 100644 --- a/src/LangChoice.cpp +++ b/src/LangChoice.cpp @@ -103,7 +103,7 @@ LangChoiceDialog::LangChoiceDialog(wxWindow * parent, Fit(); } -void LangChoiceDialog::OnOk(wxCommandEvent & event) +void LangChoiceDialog::OnOk(wxCommandEvent & WXUNUSED(event)) { int ndx = mChoice->GetSelection(); mLang = mLangCodes[ndx]; diff --git a/src/Lyrics.cpp b/src/Lyrics.cpp index e525ce45c..e858becfc 100644 --- a/src/Lyrics.cpp +++ b/src/Lyrics.cpp @@ -445,7 +445,7 @@ void Lyrics::OnKeyEvent(wxKeyEvent & event) GetActiveProject()->HandleKeyDown(event); } -void Lyrics::OnPaint(wxPaintEvent &evt) +void Lyrics::OnPaint(wxPaintEvent & WXUNUSED(event)) { if (!this->GetParent()->IsShown()) return; @@ -476,7 +476,7 @@ void Lyrics::OnPaint(wxPaintEvent &evt) } } -void Lyrics::OnSize(wxSizeEvent &evt) +void Lyrics::OnSize(wxSizeEvent & WXUNUSED(event)) { GetClientSize(&mWidth, &mHeight); diff --git a/src/LyricsWindow.cpp b/src/LyricsWindow.cpp index 18da766cd..02a13f912 100644 --- a/src/LyricsWindow.cpp +++ b/src/LyricsWindow.cpp @@ -131,12 +131,12 @@ void LyricsWindow::OnCloseWindow(wxCloseEvent & WXUNUSED(event)) this->Hide(); } -void LyricsWindow::OnStyle_BouncingBall(wxCommandEvent &evt) +void LyricsWindow::OnStyle_BouncingBall(wxCommandEvent & WXUNUSED(event)) { mLyricsPanel->SetLyricsStyle(Lyrics::kBouncingBallLyrics); } -void LyricsWindow::OnStyle_Highlight(wxCommandEvent &evt) +void LyricsWindow::OnStyle_Highlight(wxCommandEvent & WXUNUSED(event)) { mLyricsPanel->SetLyricsStyle(Lyrics::kHighlightLyrics); } diff --git a/src/Menus.cpp b/src/Menus.cpp index 20b97b15f..9f53f6a6c 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -5033,7 +5033,7 @@ void AudacityProject::HandleAlign(int index, bool moveSel) double newPos = -1.0; wxArrayDouble trackStartArray; wxArrayDouble trackEndArray; - double firstTrackOffset; + double firstTrackOffset=0.0f; while (t) { // We only want Wave and Note tracks here. diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp index c72760a21..b586ff483 100644 --- a/src/MixerBoard.cpp +++ b/src/MixerBoard.cpp @@ -759,7 +759,7 @@ void MixerTrackCluster::OnMouseEvent(wxMouseEvent& event) event.Skip(); } -void MixerTrackCluster::OnPaint(wxPaintEvent &evt) +void MixerTrackCluster::OnPaint(wxPaintEvent & WXUNUSED(event)) { wxPaintDC dc(this); @@ -789,18 +789,18 @@ void MixerTrackCluster::OnPaint(wxPaintEvent &evt) } -void MixerTrackCluster::OnButton_MusicalInstrument(wxCommandEvent& event) +void MixerTrackCluster::OnButton_MusicalInstrument(wxCommandEvent& WXUNUSED(event)) { bool bShiftDown = ::wxGetMouseState().ShiftDown(); this->HandleSelect(bShiftDown); } -void MixerTrackCluster::OnSlider_Gain(wxCommandEvent& event) +void MixerTrackCluster::OnSlider_Gain(wxCommandEvent& WXUNUSED(event)) { this->HandleSliderGain(); } -//v void MixerTrackCluster::OnSliderScroll_Gain(wxScrollEvent& event) +//v void MixerTrackCluster::OnSliderScroll_Gain(wxScrollEvent& WXUNUSED(event)) //{ //int sliderValue = (int)(mSlider_Gain->Get()); //v mSlider_Gain->GetValue(); //#ifdef __WXMSW__ @@ -815,12 +815,12 @@ void MixerTrackCluster::OnSlider_Gain(wxCommandEvent& event) //mSlider_Gain->SetToolTip(str); //} -void MixerTrackCluster::OnSlider_Pan(wxCommandEvent& event) +void MixerTrackCluster::OnSlider_Pan(wxCommandEvent& WXUNUSED(event)) { this->HandleSliderPan(); } -void MixerTrackCluster::OnButton_Mute(wxCommandEvent& event) +void MixerTrackCluster::OnButton_Mute(wxCommandEvent& WXUNUSED(event)) { #ifdef EXPERIMENTAL_MIDI_OUT mProject->HandleTrackMute(mTrack, mToggleButton_Mute->WasShiftDown()); @@ -846,7 +846,7 @@ void MixerTrackCluster::OnButton_Mute(wxCommandEvent& event) #endif } -void MixerTrackCluster::OnButton_Solo(wxCommandEvent& event) +void MixerTrackCluster::OnButton_Solo(wxCommandEvent& WXUNUSED(event)) { #ifdef EXPERIMENTAL_MIDI_OUT mProject->HandleTrackSolo(mTrack, mToggleButton_Solo->WasShiftDown()); @@ -1748,7 +1748,7 @@ void MixerBoardFrame::OnMaximize(wxMaximizeEvent &event) event.Skip(); } -void MixerBoardFrame::OnSize(wxSizeEvent &event) +void MixerBoardFrame::OnSize(wxSizeEvent & WXUNUSED(event)) { mMixerBoard->SetSize(this->GetClientSize()); } diff --git a/src/NoteTrack.cpp b/src/NoteTrack.cpp index c39255c63..fb8d9f343 100644 --- a/src/NoteTrack.cpp +++ b/src/NoteTrack.cpp @@ -793,7 +793,7 @@ bool NoteTrack::HandleXMLTag(const wxChar *tag, const wxChar **attrs) return false; } -XMLTagHandler *NoteTrack::HandleXMLChild(const wxChar *tag) +XMLTagHandler *NoteTrack::HandleXMLChild(const wxChar * WXUNUSED(tag)) { return NULL; } diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp index 0ff416906..9e3584614 100644 --- a/src/PluginManager.cpp +++ b/src/PluginManager.cpp @@ -53,7 +53,7 @@ PluginManager::~PluginManager() } } -PluginManager & PluginManager::Get(bool refresh) +PluginManager & PluginManager::Get(bool WXUNUSED(refresh)) { return mInstance; } diff --git a/src/Printing.cpp b/src/Printing.cpp index b968e9527..5708a9fa2 100644 --- a/src/Printing.cpp +++ b/src/Printing.cpp @@ -53,7 +53,7 @@ class AudacityPrintout : public wxPrintout TrackList *mTracks; }; -bool AudacityPrintout::OnPrintPage(int page) +bool AudacityPrintout::OnPrintPage(int WXUNUSED(page)) { wxDC *dc = GetDC(); if (!dc) diff --git a/src/Profiler.cpp b/src/Profiler.cpp index 7f20d9fcc..98796c6a0 100644 --- a/src/Profiler.cpp +++ b/src/Profiler.cpp @@ -152,7 +152,7 @@ void TaskProfile::Begin(char* fileName, int lineNum, char* taskDescription) } ///end the task timer. -void TaskProfile::End(char* fileName, int lineNum, char* taskDescription) +void TaskProfile::End(char* WXUNUSED(fileName), int WXUNUSED(lineNum), char* WXUNUSED(taskDescription)) { mCumTime += clock() - mLastTime; mNumHits++; diff --git a/src/Project.cpp b/src/Project.cpp index 017c2f2d5..7d13f041d 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -269,7 +269,7 @@ public: { } - bool IsSupportedFormat(const wxDataFormat & format, Direction dir = Get) const + bool IsSupportedFormat(const wxDataFormat & format, Direction WXUNUSED(dir = Get)) const { if (format.GetType() == wxDF_FILENAME) { return true; @@ -391,7 +391,7 @@ public: #endif - bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames) + bool OnDropFiles(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxArrayString& filenames) { //sort by OD non OD. load Non OD first so user can start editing asap. wxArrayString sortednames(filenames); @@ -1600,7 +1600,7 @@ void AudacityProject::AllProjectsDeleteUnlock() } ///Handles the redrawing necessary for tasks as they partially update in the background. -void AudacityProject::OnODTaskUpdate(wxCommandEvent & event) +void AudacityProject::OnODTaskUpdate(wxCommandEvent & WXUNUSED(event)) { //todo: add track data to the event - check to see if the project contains it before redrawing. if(mTrackPanel) @@ -1609,13 +1609,13 @@ void AudacityProject::OnODTaskUpdate(wxCommandEvent & event) } //redraws the task and does other book keeping after the task is complete. -void AudacityProject::OnODTaskComplete(wxCommandEvent & event) +void AudacityProject::OnODTaskComplete(wxCommandEvent & WXUNUSED(event)) { if(mTrackPanel) mTrackPanel->Refresh(false); } -void AudacityProject::OnScroll(wxScrollEvent & event) +void AudacityProject::OnScroll(wxScrollEvent & WXUNUSED(event)) { wxInt64 hlast = mViewInfo.sbarH; @@ -1685,7 +1685,7 @@ bool AudacityProject::HandleKeyDown(wxKeyEvent & event) return mCommandManager.HandleKey(event, GetUpdateFlags(), 0xFFFFFFFF); } -bool AudacityProject::HandleChar(wxKeyEvent & event) +bool AudacityProject::HandleChar(wxKeyEvent & WXUNUSED(event)) { return false; } @@ -1758,7 +1758,7 @@ void AudacityProject::OnMenu(wxCommandEvent & event) event.Skip(true); } -void AudacityProject::OnUpdateUI(wxUpdateUIEvent & event) +void AudacityProject::OnUpdateUI(wxUpdateUIEvent & WXUNUSED(event)) { UpdateMenus(); } @@ -3981,7 +3981,7 @@ void AudacityProject::SetStop(bool bStopped) mTrackPanel->SetStop(bStopped); } -void AudacityProject::OnTimer(wxTimerEvent& event) +void AudacityProject::OnTimer(wxTimerEvent& WXUNUSED(event)) { MixerToolBar *mixerToolBar = GetMixerToolBar(); if( mixerToolBar ) diff --git a/src/Screenshot.cpp b/src/Screenshot.cpp index 79cabbed1..a91b43d0b 100644 --- a/src/Screenshot.cpp +++ b/src/Screenshot.cpp @@ -45,54 +45,54 @@ class ScreenFrame:public wxFrame ScreenFrame(wxWindow *parent, wxWindowID id); virtual ~ScreenFrame(); - virtual bool ProcessEvent(wxEvent & e); + virtual bool ProcessEvent(wxEvent & event); private: void Populate(); void PopulateOrExchange(ShuttleGui &S); - void OnCloseWindow(wxCloseEvent & e); - void OnUIUpdate(wxUpdateUIEvent & e); - void OnDirChoose(wxCommandEvent & e); + void OnCloseWindow(wxCloseEvent & event); + void OnUIUpdate(wxUpdateUIEvent & event); + void OnDirChoose(wxCommandEvent & event); void SizeMainWindow(int w, int h); - void OnMainWindowSmall(wxCommandEvent & e); - void OnMainWindowLarge(wxCommandEvent & e); - void OnToggleBackgroundBlue(wxCommandEvent & e); - void OnToggleBackgroundWhite(wxCommandEvent & e); + void OnMainWindowSmall(wxCommandEvent & event); + void OnMainWindowLarge(wxCommandEvent & event); + void OnToggleBackgroundBlue(wxCommandEvent & event); + void OnToggleBackgroundWhite(wxCommandEvent & event); void DoCapture(wxString captureMode); - void OnCaptureWindowContents(wxCommandEvent & e); - void OnCaptureFullWindow(wxCommandEvent & e); - void OnCaptureWindowPlus(wxCommandEvent & e); - void OnCaptureFullScreen(wxCommandEvent & e); - void OnCaptureToolbars(wxCommandEvent & e); - void OnCaptureSelectionBar(wxCommandEvent & e); - void OnCaptureTools(wxCommandEvent & e); - void OnCaptureTransport(wxCommandEvent & e); - void OnCaptureMixer(wxCommandEvent & e); - void OnCaptureMeter(wxCommandEvent & e); - void OnCaptureEdit(wxCommandEvent & e); - void OnCaptureDevice(wxCommandEvent & e); - void OnCaptureTranscription(wxCommandEvent & e); + void OnCaptureWindowContents(wxCommandEvent & event); + void OnCaptureFullWindow(wxCommandEvent & event); + void OnCaptureWindowPlus(wxCommandEvent & event); + void OnCaptureFullScreen(wxCommandEvent & event); + void OnCaptureToolbars(wxCommandEvent & event); + void OnCaptureSelectionBar(wxCommandEvent & event); + void OnCaptureTools(wxCommandEvent & event); + void OnCaptureTransport(wxCommandEvent & event); + void OnCaptureMixer(wxCommandEvent & event); + void OnCaptureMeter(wxCommandEvent & event); + void OnCaptureEdit(wxCommandEvent & event); + void OnCaptureDevice(wxCommandEvent & event); + void OnCaptureTranscription(wxCommandEvent & event); void TimeZoom(double seconds); - void OnOneSec(wxCommandEvent & e); - void OnTenSec(wxCommandEvent & e); - void OnOneMin(wxCommandEvent & e); - void OnFiveMin(wxCommandEvent & e); - void OnOneHour(wxCommandEvent & e); + void OnOneSec(wxCommandEvent & event); + void OnTenSec(wxCommandEvent & event); + void OnOneMin(wxCommandEvent & event); + void OnFiveMin(wxCommandEvent & event); + void OnOneHour(wxCommandEvent & event); void SizeTracks(int h); - void OnShortTracks(wxCommandEvent & e); - void OnMedTracks(wxCommandEvent & e); - void OnTallTracks(wxCommandEvent & e); + void OnShortTracks(wxCommandEvent & event); + void OnMedTracks(wxCommandEvent & event); + void OnTallTracks(wxCommandEvent & event); - void OnCaptureTrackPanel(wxCommandEvent & e); - void OnCaptureRuler(wxCommandEvent & e); - void OnCaptureTracks(wxCommandEvent & e); - void OnCaptureFirstTrack(wxCommandEvent & e); - void OnCaptureSecondTrack(wxCommandEvent & e); + void OnCaptureTrackPanel(wxCommandEvent & event); + void OnCaptureRuler(wxCommandEvent & event); + void OnCaptureTracks(wxCommandEvent & event); + void OnCaptureFirstTrack(wxCommandEvent & event); + void OnCaptureSecondTrack(wxCommandEvent & event); ScreenshotCommand *CreateCommand(); @@ -135,10 +135,10 @@ class ScreenFrameTimer:public wxTimer { public: ScreenFrameTimer(ScreenFrame *frame, - wxEvent & e) + wxEvent & event) { screenFrame = frame; - evt = e.Clone(); + evt = event.Clone(); } virtual void Notify() @@ -471,13 +471,13 @@ bool ScreenFrame::ProcessEvent(wxEvent & e) return wxFrame::ProcessEvent(e); } -void ScreenFrame::OnCloseWindow(wxCloseEvent & e) +void ScreenFrame::OnCloseWindow(wxCloseEvent & WXUNUSED(event)) { mFrame = NULL; Destroy(); } -void ScreenFrame::OnUIUpdate(wxUpdateUIEvent & e) +void ScreenFrame::OnUIUpdate(wxUpdateUIEvent & WXUNUSED(event)) { #ifdef __WXMAC__ wxTopLevelWindow *top = mCommand->GetFrontWindow(mContext.proj); @@ -504,7 +504,7 @@ void ScreenFrame::OnUIUpdate(wxUpdateUIEvent & e) #endif } -void ScreenFrame::OnDirChoose(wxCommandEvent & e) +void ScreenFrame::OnDirChoose(wxCommandEvent & WXUNUSED(event)) { wxString current = mDirectoryTextBox->GetValue(); @@ -523,14 +523,14 @@ void ScreenFrame::OnDirChoose(wxCommandEvent & e) } } -void ScreenFrame::OnToggleBackgroundBlue(wxCommandEvent & e) +void ScreenFrame::OnToggleBackgroundBlue(wxCommandEvent & WXUNUSED(event)) { mWhite->SetValue(false); mCommand->SetParameter(wxT("Background"), mBlue->GetValue() ? wxT("Blue") : wxT("None")); } -void ScreenFrame::OnToggleBackgroundWhite(wxCommandEvent & e) +void ScreenFrame::OnToggleBackgroundWhite(wxCommandEvent & WXUNUSED(event)) { mBlue->SetValue(false); mCommand->SetParameter(wxT("Background"), @@ -546,12 +546,12 @@ void ScreenFrame::SizeMainWindow(int w, int h) mContext.proj->mToolManager->Reset(); } -void ScreenFrame::OnMainWindowSmall(wxCommandEvent & e) +void ScreenFrame::OnMainWindowSmall(wxCommandEvent & WXUNUSED(event)) { SizeMainWindow(680, 450); } -void ScreenFrame::OnMainWindowLarge(wxCommandEvent & e) +void ScreenFrame::OnMainWindowLarge(wxCommandEvent & WXUNUSED(event)) { SizeMainWindow(900, 600); } @@ -567,92 +567,92 @@ void ScreenFrame::DoCapture(wxString captureMode) Show(); } -void ScreenFrame::OnCaptureWindowContents(wxCommandEvent & e) +void ScreenFrame::OnCaptureWindowContents(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("window")); } -void ScreenFrame::OnCaptureFullWindow(wxCommandEvent & e) +void ScreenFrame::OnCaptureFullWindow(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("fullwindow")); } -void ScreenFrame::OnCaptureWindowPlus(wxCommandEvent & e) +void ScreenFrame::OnCaptureWindowPlus(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("windowplus")); } -void ScreenFrame::OnCaptureFullScreen(wxCommandEvent & e) +void ScreenFrame::OnCaptureFullScreen(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("fullscreen")); } -void ScreenFrame::OnCaptureToolbars(wxCommandEvent & e) +void ScreenFrame::OnCaptureToolbars(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("toolbars")); } -void ScreenFrame::OnCaptureSelectionBar(wxCommandEvent & e) +void ScreenFrame::OnCaptureSelectionBar(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("selectionbar")); } -void ScreenFrame::OnCaptureTools(wxCommandEvent & e) +void ScreenFrame::OnCaptureTools(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("tools")); } -void ScreenFrame::OnCaptureTransport(wxCommandEvent & e) +void ScreenFrame::OnCaptureTransport(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("transport")); } -void ScreenFrame::OnCaptureMixer(wxCommandEvent & e) +void ScreenFrame::OnCaptureMixer(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("mixer")); } -void ScreenFrame::OnCaptureMeter(wxCommandEvent & e) +void ScreenFrame::OnCaptureMeter(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("meter")); } -void ScreenFrame::OnCaptureEdit(wxCommandEvent & e) +void ScreenFrame::OnCaptureEdit(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("edit")); } -void ScreenFrame::OnCaptureDevice(wxCommandEvent & e) +void ScreenFrame::OnCaptureDevice(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("device")); } -void ScreenFrame::OnCaptureTranscription(wxCommandEvent & e) +void ScreenFrame::OnCaptureTranscription(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("transcription")); } -void ScreenFrame::OnCaptureTrackPanel(wxCommandEvent & e) +void ScreenFrame::OnCaptureTrackPanel(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("trackpanel")); } -void ScreenFrame::OnCaptureRuler(wxCommandEvent & e) +void ScreenFrame::OnCaptureRuler(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("ruler")); } -void ScreenFrame::OnCaptureTracks(wxCommandEvent & e) +void ScreenFrame::OnCaptureTracks(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("tracks")); } -void ScreenFrame::OnCaptureFirstTrack(wxCommandEvent & e) +void ScreenFrame::OnCaptureFirstTrack(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("firsttrack")); } -void ScreenFrame::OnCaptureSecondTrack(wxCommandEvent & e) +void ScreenFrame::OnCaptureSecondTrack(wxCommandEvent & WXUNUSED(event)) { DoCapture(wxT("secondtrack")); } @@ -665,27 +665,27 @@ void ScreenFrame::TimeZoom(double seconds) mContext.proj->RedrawProject(); } -void ScreenFrame::OnOneSec(wxCommandEvent & e) +void ScreenFrame::OnOneSec(wxCommandEvent & WXUNUSED(event)) { TimeZoom(1.0); } -void ScreenFrame::OnTenSec(wxCommandEvent & e) +void ScreenFrame::OnTenSec(wxCommandEvent & WXUNUSED(event)) { TimeZoom(10.0); } -void ScreenFrame::OnOneMin(wxCommandEvent & e) +void ScreenFrame::OnOneMin(wxCommandEvent & WXUNUSED(event)) { TimeZoom(60.0); } -void ScreenFrame::OnFiveMin(wxCommandEvent & e) +void ScreenFrame::OnFiveMin(wxCommandEvent & WXUNUSED(event)) { TimeZoom(300.0); } -void ScreenFrame::OnOneHour(wxCommandEvent & e) +void ScreenFrame::OnOneHour(wxCommandEvent & WXUNUSED(event)) { TimeZoom(3600.0); } @@ -706,7 +706,7 @@ void ScreenFrame::SizeTracks(int h) mContext.proj->RedrawProject(); } -void ScreenFrame::OnShortTracks(wxCommandEvent & e) +void ScreenFrame::OnShortTracks(wxCommandEvent & WXUNUSED(event)) { TrackListIterator iter(mContext.proj->GetTracks()); for (Track * t = iter.First(); t; t = iter.Next()) { @@ -717,12 +717,12 @@ void ScreenFrame::OnShortTracks(wxCommandEvent & e) mContext.proj->RedrawProject(); } -void ScreenFrame::OnMedTracks(wxCommandEvent & e) +void ScreenFrame::OnMedTracks(wxCommandEvent & WXUNUSED(event)) { SizeTracks(60); } -void ScreenFrame::OnTallTracks(wxCommandEvent & e) +void ScreenFrame::OnTallTracks(wxCommandEvent & WXUNUSED(event)) { SizeTracks(85); } diff --git a/src/Shuttle.cpp b/src/Shuttle.cpp index c29bc7efb..d5e7a038e 100644 --- a/src/Shuttle.cpp +++ b/src/Shuttle.cpp @@ -237,7 +237,7 @@ bool Shuttle::TransferEnum( const wxString & Name, int & iValue, return true; } -bool Shuttle::TransferString( const wxString & Name, wxString & strValue, const wxString &strDefault ) +bool Shuttle::TransferString( const wxString & Name, wxString & strValue, const wxString & WXUNUSED(strDefault) ) { if( mbStoreInClient ) { @@ -272,7 +272,7 @@ bool Shuttle::TransferWrappedType( const wxString & Name, WrappedType & W ) } -bool Shuttle::ExchangeWithMaster(const wxString & Name) +bool Shuttle::ExchangeWithMaster(const wxString & WXUNUSED(Name)) { // ExchangeWithMaster() will usually be over-ridden // in derived classes. We could have made it an diff --git a/src/ShuttlePrefs.cpp b/src/ShuttlePrefs.cpp index b655adf1c..1ab47500d 100644 --- a/src/ShuttlePrefs.cpp +++ b/src/ShuttlePrefs.cpp @@ -116,7 +116,7 @@ bool ShuttlePrefs::TransferWrappedType( const wxString & Name, WrappedType & W ) return false; } -bool ShuttlePrefs::ExchangeWithMaster(const wxString & Name) +bool ShuttlePrefs::ExchangeWithMaster(const wxString & WXUNUSED(Name)) { // ShuttlePrefs is unusual in that it overloads ALL the Transfer functions // which it supports. It doesn't do any string conversion, because wxConv will diff --git a/src/SoundActivatedRecord.cpp b/src/SoundActivatedRecord.cpp index 48d57144d..636849851 100644 --- a/src/SoundActivatedRecord.cpp +++ b/src/SoundActivatedRecord.cpp @@ -64,7 +64,7 @@ void SoundActivatedRecord::PopulateOrExchange(ShuttleGui & S) S.AddStandardButtons(); } -void SoundActivatedRecord::OnOK(wxCommandEvent & event) +void SoundActivatedRecord::OnOK(wxCommandEvent & WXUNUSED(event)) { ShuttleGui S( this, eIsSavingToPrefs ); PopulateOrExchange( S ); diff --git a/src/Spectrum.cpp b/src/Spectrum.cpp index 6dd2aa228..42b83be07 100644 --- a/src/Spectrum.cpp +++ b/src/Spectrum.cpp @@ -35,7 +35,7 @@ static inline float todB_a(const float *x){ bool ComputeSpectrum(float * data, int width, int windowSize, - double rate, float *output, + double WXUNUSED(rate), float *output, bool autocorrelation, int windowFunc) { if (width < windowSize) diff --git a/src/Tags.cpp b/src/Tags.cpp index f7ce27787..c6f3a8b6d 100644 --- a/src/Tags.cpp +++ b/src/Tags.cpp @@ -562,7 +562,7 @@ public: { } - virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) + virtual void PaintBackground(const wxRect& WXUNUSED(rectCell), wxGridCellAttr * WXUNUSED(attr)) { // Ignore it (a must on the Mac as the erasure causes problems.) } @@ -960,7 +960,7 @@ void TagsEditor::OnChange(wxGridEvent & event) return; } -void TagsEditor::OnEdit(wxCommandEvent & event) +void TagsEditor::OnEdit(wxCommandEvent & WXUNUSED(event)) { if (mGrid->IsCellEditControlShown()) { mGrid->SaveEditControlValue(); @@ -1009,7 +1009,7 @@ void TagsEditor::OnEdit(wxCommandEvent & event) PopulateGenres(); } -void TagsEditor::OnReset(wxCommandEvent & event) +void TagsEditor::OnReset(wxCommandEvent & WXUNUSED(event)) { int id = wxMessageBox(_("Are you sure you want to reset the genre list to defaults?"), _("Reset Genres"), @@ -1049,14 +1049,14 @@ void TagsEditor::OnReset(wxCommandEvent & event) PopulateGenres(); } -void TagsEditor::OnClear(wxCommandEvent & event) +void TagsEditor::OnClear(wxCommandEvent & WXUNUSED(event)) { mLocal.Clear(); TransferDataToWindow(); } -void TagsEditor::OnLoad(wxCommandEvent & event) +void TagsEditor::OnLoad(wxCommandEvent & WXUNUSED(event)) { wxString fn; @@ -1107,7 +1107,7 @@ void TagsEditor::OnLoad(wxCommandEvent & event) return; } -void TagsEditor::OnSave(wxCommandEvent & event) +void TagsEditor::OnSave(wxCommandEvent & WXUNUSED(event)) { wxString fn; @@ -1176,7 +1176,7 @@ void TagsEditor::OnSave(wxCommandEvent & event) } } -void TagsEditor::OnSaveDefaults(wxCommandEvent & event) +void TagsEditor::OnSaveDefaults(wxCommandEvent & WXUNUSED(event)) { // Refresh tags TransferDataFromWindow(); @@ -1216,12 +1216,12 @@ void TagsEditor::OnSaveDefaults(wxCommandEvent & event) } } -void TagsEditor::OnAdd(wxCommandEvent & event) +void TagsEditor::OnAdd(wxCommandEvent & WXUNUSED(event)) { mGrid->AppendRows(); } -void TagsEditor::OnRemove(wxCommandEvent & event) +void TagsEditor::OnRemove(wxCommandEvent & WXUNUSED(event)) { size_t row = mGrid->GetCursorRow(); @@ -1239,7 +1239,7 @@ void TagsEditor::OnRemove(wxCommandEvent & event) } } -void TagsEditor::OnOk(wxCommandEvent & event) +void TagsEditor::OnOk(wxCommandEvent & WXUNUSED(event)) { if (mGrid->IsCellEditControlShown()) { mGrid->SaveEditControlValue(); @@ -1263,7 +1263,7 @@ void TagsEditor::OnOk(wxCommandEvent & event) EndModal(wxID_OK); } -void TagsEditor::OnCancel(wxCommandEvent & event) +void TagsEditor::OnCancel(wxCommandEvent & WXUNUSED(event)) { if (mGrid->IsCellEditControlShown()) { mGrid->GetCellEditor(mGrid->GetGridCursorRow(), diff --git a/src/TimeTrack.cpp b/src/TimeTrack.cpp index 65a50ed9b..6612ba977 100644 --- a/src/TimeTrack.cpp +++ b/src/TimeTrack.cpp @@ -186,7 +186,7 @@ bool TimeTrack::HandleXMLTag(const wxChar *tag, const wxChar **attrs) return false; } -void TimeTrack::HandleXMLEndTag(const wxChar *tag) +void TimeTrack::HandleXMLEndTag(const wxChar * WXUNUSED(tag)) { if(mRescaleXMLValues) { diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp index 75b440001..6f81fc3aa 100644 --- a/src/TimerRecordDialog.cpp +++ b/src/TimerRecordDialog.cpp @@ -99,7 +99,7 @@ TimerRecordDialog::~TimerRecordDialog() { } -void TimerRecordDialog::OnTimer(wxTimerEvent& event) +void TimerRecordDialog::OnTimer(wxTimerEvent& WXUNUSED(event)) { wxDateTime dateTime_UNow = wxDateTime::UNow(); if (m_DateTime_Start < dateTime_UNow) { @@ -110,7 +110,7 @@ void TimerRecordDialog::OnTimer(wxTimerEvent& event) } } -void TimerRecordDialog::OnDatePicker_Start(wxDateEvent& event) +void TimerRecordDialog::OnDatePicker_Start(wxDateEvent& WXUNUSED(event)) { m_DateTime_Start = m_pDatePickerCtrl_Start->GetValue(); double dTime = m_pTimeTextCtrl_Start->GetTimeValue(); @@ -132,7 +132,7 @@ void TimerRecordDialog::OnDatePicker_Start(wxDateEvent& event) this->UpdateEnd(); } -void TimerRecordDialog::OnTimeText_Start(wxCommandEvent& event) +void TimerRecordDialog::OnTimeText_Start(wxCommandEvent& WXUNUSED(event)) { //v TimeTextCtrl doesn't implement upper ranges, i.e., if I tell it "024 h 060 m 060 s", then // user increments the hours past 23, it rolls over to 0 (although if you increment below 0, it stays at 0). @@ -150,7 +150,7 @@ void TimerRecordDialog::OnTimeText_Start(wxCommandEvent& event) this->OnDatePicker_Start(dummyDateEvent); } -void TimerRecordDialog::OnDatePicker_End(wxDateEvent& event) +void TimerRecordDialog::OnDatePicker_End(wxDateEvent& WXUNUSED(event)) { m_DateTime_End = m_pDatePickerCtrl_End->GetValue(); double dTime = m_pTimeTextCtrl_End->GetTimeValue(); @@ -172,7 +172,7 @@ void TimerRecordDialog::OnDatePicker_End(wxDateEvent& event) this->UpdateDuration(); // Keep Start constant and update Duration for changed End. } -void TimerRecordDialog::OnTimeText_End(wxCommandEvent& event) +void TimerRecordDialog::OnTimeText_End(wxCommandEvent& WXUNUSED(event)) { //v TimeTextCtrl doesn't implement upper ranges, i.e., if I tell it "024 h 060 m 060 s", then // user increments the hours past 23, it rolls over to 0 (although if you increment below 0, it stays at 0). @@ -190,7 +190,7 @@ void TimerRecordDialog::OnTimeText_End(wxCommandEvent& event) this->OnDatePicker_End(dummyDateEvent); } -void TimerRecordDialog::OnTimeText_Duration(wxCommandEvent& event) +void TimerRecordDialog::OnTimeText_Duration(wxCommandEvent& WXUNUSED(event)) { double dTime = m_pTimeTextCtrl_Duration->GetTimeValue(); long hr = (long)(dTime / 3600.0); @@ -201,7 +201,7 @@ void TimerRecordDialog::OnTimeText_Duration(wxCommandEvent& event) this->UpdateEnd(); // Keep Start constant and update End for changed Duration. } -void TimerRecordDialog::OnOK(wxCommandEvent& event) +void TimerRecordDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { this->TransferDataFromWindow(); if (!m_TimeSpan_Duration.IsPositive()) diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp index 54fb76907..1b69e3725 100644 --- a/src/TrackArtist.cpp +++ b/src/TrackArtist.cpp @@ -1174,7 +1174,7 @@ void TrackArtist::DrawMinMaxRMS(wxDC &dc, const wxRect &r, const double env[], void TrackArtist::DrawIndividualSamples(wxDC &dc, const wxRect &r, float zoomMin, float zoomMax, bool dB, WaveClip *clip, - double t0, double pps, double h, + double t0, double pps, double WXUNUSED(h), bool drawSamples, bool showPoints, bool muted) { double rate = clip->GetRate(); @@ -1621,10 +1621,10 @@ void TrackArtist::DrawClipWaveform(WaveTrack *track, } -void TrackArtist::DrawTimeSlider(WaveTrack *track, +void TrackArtist::DrawTimeSlider(WaveTrack * WXUNUSED(track), wxDC & dc, const wxRect & r, - const ViewInfo *viewInfo, + const ViewInfo * WXUNUSED(viewInfo), bool rightwards) { const int border = 3; // 3 pixels all round. diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index 967605f9c..14d00df6d 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -2072,7 +2072,7 @@ void TrackPanel::SelectionHandleClick(wxMouseEvent & event, // find nearest beat to sel0, sel1 double minPeriod = 0.05; // minimum beat period double qBeat0, qBeat1; - double centerBeat; + double centerBeat = 0.0f; mStretchSel0 = nt->NearestBeatTime(mViewInfo->sel0, &qBeat0); mStretchSel1 = nt->NearestBeatTime(mViewInfo->sel1, &qBeat1); @@ -3614,7 +3614,7 @@ void TrackPanel::HandleVZoomButtonUp( wxMouseEvent & event ) /// Determines if we can edit samples in a wave track. /// Also pops up warning messages in certain cases where we can't. /// @return true if we can edit the samples, false otherwise. -bool TrackPanel::IsSampleEditingPossible( wxMouseEvent & event, Track * t ) +bool TrackPanel::IsSampleEditingPossible( wxMouseEvent & WXUNUSED(event), Track * t ) { //Exit if we don't have a track if(!t) @@ -3914,7 +3914,7 @@ void TrackPanel::HandleSampleEditingDrag( wxMouseEvent & event ) RefreshTrack(mDrawingTrack); } -void TrackPanel::HandleSampleEditingButtonUp( wxMouseEvent & event ) +void TrackPanel::HandleSampleEditingButtonUp( wxMouseEvent & WXUNUSED(event)) { //************************************************* //*** UP-CLICK (Finish drawing) *** @@ -4253,7 +4253,7 @@ void TrackPanel::OnTrackListUpdated(wxCommandEvent & e) e.Skip(); } -void TrackPanel::OnContextMenu(wxContextMenuEvent & event) +void TrackPanel::OnContextMenu(wxContextMenuEvent & WXUNUSED(event)) { OnTrackMenu(); } @@ -4520,7 +4520,7 @@ bool TrackPanel::MuteSoloFunc(Track * t, wxRect r, int x, int y, return true; } -bool TrackPanel::TrackSelFunc(Track * t, wxRect r, int x, int y) +bool TrackPanel::TrackSelFunc(Track * WXUNUSED(t), wxRect r, int x, int y) { // First check the blank space to left of minimize button. wxRect selRect; @@ -4681,7 +4681,7 @@ void TrackPanel::HandleResizeClick( wxMouseEvent & event ) /// We also modify the undo state (the action doesn't become /// undo-able, but it gets merged with the previous undo-able /// event). -void TrackPanel::HandleResizeButtonUp(wxMouseEvent & event) +void TrackPanel::HandleResizeButtonUp(wxMouseEvent & WXUNUSED(event)) { SetCapturedTrack( NULL ); MakeParentRedrawScrollbars(); @@ -5068,7 +5068,7 @@ void TrackPanel::OnChar(wxKeyEvent & event) } /// Should handle the case when the mouse capture is lost. -void TrackPanel::OnCaptureLost(wxMouseCaptureLostEvent & event) +void TrackPanel::OnCaptureLost(wxMouseCaptureLostEvent & WXUNUSED(event)) { wxMouseEvent e(wxEVT_LEFT_UP); @@ -5710,7 +5710,7 @@ bool TrackPanel::HitTestSamples(Track *track, wxRect &r, wxMouseEvent & event) /// method that tells us if the mouse event landed on a /// time-slider that allows us to time shift the sequence. -bool TrackPanel::HitTestSlide(Track *track, wxRect &r, wxMouseEvent & event) +bool TrackPanel::HitTestSlide(Track * WXUNUSED(track), wxRect &r, wxMouseEvent & event) { // Perhaps we should delegate this to TrackArtist as only TrackArtist // knows what the real sizes are?? @@ -5829,7 +5829,7 @@ void TrackPanel::DrawTracks(wxDC * dc) /// - Fills in space below the tracks. void TrackPanel::DrawEverythingElse(wxDC * dc, const wxRegion region, - const wxRect panelRect, + const wxRect WXUNUSED(panelRect), const wxRect clip) { // We draw everything else @@ -7337,13 +7337,13 @@ void TrackPanel::OnChannelChange(wxCommandEvent & event) } /// Split a stereo track into two tracks... -void TrackPanel::OnSplitStereo(wxCommandEvent &event) +void TrackPanel::OnSplitStereo(wxCommandEvent & WXUNUSED(event)) { SplitStereo(true); } /// Split a stereo track into two mono tracks... -void TrackPanel::OnSplitStereoMono(wxCommandEvent &event) +void TrackPanel::OnSplitStereoMono(wxCommandEvent & WXUNUSED(event)) { SplitStereo(false); } @@ -7405,7 +7405,7 @@ void TrackPanel::SplitStereo(bool stereo) } /// Merge two tracks into one stereo track ?? -void TrackPanel::OnMergeStereo(wxCommandEvent &event) +void TrackPanel::OnMergeStereo(wxCommandEvent & WXUNUSED(event)) { wxASSERT(mPopupMenuTarget); mPopupMenuTarget->SetLinked(true); @@ -7811,7 +7811,7 @@ void TrackPanel::OnChangeOctave(wxCommandEvent & event) #endif } -void TrackPanel::OnSetName(wxCommandEvent &event) +void TrackPanel::OnSetName(wxCommandEvent & WXUNUSED(event)) { Track *t = mPopupMenuTarget; if (t) @@ -7843,7 +7843,7 @@ void TrackPanel::OnSetName(wxCommandEvent &event) } /// Cut selected text if cut menu item is selected -void TrackPanel::OnCutSelectedText(wxCommandEvent &event) +void TrackPanel::OnCutSelectedText(wxCommandEvent & WXUNUSED(event)) { LabelTrack *lt = (LabelTrack *)mPopupMenuTarget; if (lt->CutSelectedText()) { @@ -7855,7 +7855,7 @@ void TrackPanel::OnCutSelectedText(wxCommandEvent &event) } /// Copy selected text if copy menu item is selected -void TrackPanel::OnCopySelectedText(wxCommandEvent &event) +void TrackPanel::OnCopySelectedText(wxCommandEvent & WXUNUSED(event)) { LabelTrack *lt = (LabelTrack *)mPopupMenuTarget; lt->CopySelectedText(); @@ -7863,7 +7863,7 @@ void TrackPanel::OnCopySelectedText(wxCommandEvent &event) } /// paste selected text if p`aste menu item is selected -void TrackPanel::OnPasteSelectedText(wxCommandEvent &event) +void TrackPanel::OnPasteSelectedText(wxCommandEvent & WXUNUSED(event)) { LabelTrack *lt = (LabelTrack *)mPopupMenuTarget; if (lt->PasteSelectedText(mViewInfo->sel0, mViewInfo->sel1)) { @@ -7893,7 +7893,7 @@ private: wxArrayString* mFontNames; }; -void TrackPanel::OnSetFont(wxCommandEvent &event) +void TrackPanel::OnSetFont(wxCommandEvent & WXUNUSED(event)) { wxArrayString facenames; TrackPanelFontEnumerator fontEnumerator(&facenames); @@ -8217,13 +8217,13 @@ void TrackPanel::SetFocusedTrack( Track *t ) Refresh( false ); } -void TrackPanel::OnSetFocus(wxFocusEvent & event) +void TrackPanel::OnSetFocus(wxFocusEvent & WXUNUSED(event)) { SetFocusedTrack( GetFocusedTrack() ); Refresh( false ); } -void TrackPanel::OnKillFocus(wxFocusEvent & event) +void TrackPanel::OnKillFocus(wxFocusEvent & WXUNUSED(event)) { Refresh( false); } @@ -8381,7 +8381,7 @@ void TrackInfo::DrawBordersWithin(wxDC* dc, const wxRect r, bool bHasMuteSolo) } void TrackInfo::DrawBackground(wxDC * dc, const wxRect r, bool bSelected, - bool bHasMuteSolo, const int labelw, const int vrul) + bool WXUNUSED(bHasMuteSolo), const int labelw, const int WXUNUSED(vrul)) { // fill in label wxRect fill = r; diff --git a/src/UploadDialog.cpp b/src/UploadDialog.cpp index 578a09ed4..3d80bcfcb 100644 --- a/src/UploadDialog.cpp +++ b/src/UploadDialog.cpp @@ -406,14 +406,11 @@ void UploadDialog::OnListRightClick(wxListEvent &event) PopupMenu(menu, mousePos.x + 250, mousePos.y + 50); } -void UploadDialog::OnActivateSite (wxListEvent &event) +void UploadDialog::OnActivateSite (wxListEvent & WXUNUSED(event)) { - - - } -void UploadDialog::OnPopupMenu (wxCommandEvent & event) +void UploadDialog::OnPopupMenu (wxCommandEvent &event) { if (event.GetId() == wxID_POPUP_DOWNLOAD) @@ -1035,7 +1032,6 @@ void UploadDialog::UploadFile(wxString src, wxString dest) void UploadDialog::UploadDir (wxString src, wxString dest) { - wxDir *dir = new wxDir(); wxArrayString *files = new wxArrayString(); wxArrayString *dirs = new wxArrayString(); @@ -1261,7 +1257,7 @@ void UploadDialog::DownloadMultipleItems (void) } -void UploadDialog::OnCreateDir(wxCommandEvent &event) +void UploadDialog::OnCreateDir(wxCommandEvent & WXUNUSED(event)) { wxString result = wxGetTextFromUser(wxT("Please enter new folder name:"), wxT("New Folder"), wxT(""), this); @@ -1278,7 +1274,7 @@ void UploadDialog::OnCreateDir(wxCommandEvent &event) } -void UploadDialog::OnNewSite (wxCommandEvent &event) +void UploadDialog::OnNewSite (wxCommandEvent & WXUNUSED(event)) { int count; int index; @@ -1303,9 +1299,8 @@ void UploadDialog::OnNewSite (wxCommandEvent &event) ftpIndex = tmp; } -void UploadDialog::OnDeleteSite (wxCommandEvent &event) +void UploadDialog::OnDeleteSite (wxCommandEvent & WXUNUSED(event)) { - wxString debug; // debug.Printf("%d", index); @@ -1331,18 +1326,15 @@ void UploadDialog::OnDeleteSite (wxCommandEvent &event) } UpdateSiteList(); - } -void UploadDialog::OnFtpChange (wxCommandEvent &event) +void UploadDialog::OnFtpChange (wxCommandEvent & WXUNUSED(event)) { - siteList->SetItemText(ftpIndex, txtFtpName->GetValue()); } void UploadDialog::OnSelectSite (wxListEvent &event) { - currentFtp = event.m_itemIndex; ftpIndex = event.m_itemIndex; @@ -1354,8 +1346,6 @@ void UploadDialog::OnSelectSite (wxListEvent &event) //wxString debug; //debug.Printf("ftpIndex %d", ftpIndex); //wxMessageBox(debug, wxT("FTP Status"), wxOK | wxICON_INFORMATION, NULL); - - } bool UploadDialog::SaveFtpSite(wxString name, wxString host, wxString user, wxString pass) diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp index ae4348a41..c678408f8 100644 --- a/src/WaveTrack.cpp +++ b/src/WaveTrack.cpp @@ -1482,7 +1482,7 @@ bool WaveTrack::HandleXMLTag(const wxChar *tag, const wxChar **attrs) return false; } -void WaveTrack::HandleXMLEndTag(const wxChar *tag) +void WaveTrack::HandleXMLEndTag(const wxChar * WXUNUSED(tag)) { // In case we opened a pre-multiclip project, we need to // simulate closing the waveclip tag. diff --git a/src/blockfile/SilentBlockFile.cpp b/src/blockfile/SilentBlockFile.cpp index ff6d269c4..79d816b2a 100644 --- a/src/blockfile/SilentBlockFile.cpp +++ b/src/blockfile/SilentBlockFile.cpp @@ -30,7 +30,7 @@ bool SilentBlockFile::ReadSummary(void *data) } int SilentBlockFile::ReadData(samplePtr data, sampleFormat format, - sampleCount start, sampleCount len) + sampleCount WXUNUSED(start), sampleCount len) { ClearSamples(data, format, 0, len); @@ -50,7 +50,7 @@ void SilentBlockFile::SaveXML(XMLWriter &xmlFile) // even if the result is flawed (e.g., refers to nonexistent file), // as testing will be done in DirManager::ProjectFSCK(). /// static -BlockFile *SilentBlockFile::BuildFromXML(DirManager &dm, const wxChar **attrs) +BlockFile *SilentBlockFile::BuildFromXML(DirManager & WXUNUSED(dm), const wxChar **attrs) { long nValue; sampleCount len = 0; diff --git a/src/commands/BatchEvalCommand.cpp b/src/commands/BatchEvalCommand.cpp index 2363b9594..ed08b6c23 100644 --- a/src/commands/BatchEvalCommand.cpp +++ b/src/commands/BatchEvalCommand.cpp @@ -35,7 +35,7 @@ Command *BatchEvalCommandType::Create(CommandOutputTarget *target) return new BatchEvalCommand(*this, target); } -bool BatchEvalCommand::Apply(CommandExecutionContext context) +bool BatchEvalCommand::Apply(CommandExecutionContext WXUNUSED(context)) { wxString chainName = GetString(wxT("ChainName")); diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp index 80dcd65b1..241091e51 100644 --- a/src/commands/Command.cpp +++ b/src/commands/Command.cpp @@ -27,8 +27,8 @@ ApplyAndSendResponse, and CommandImplementation classes #include "CommandTargets.h" #include "CommandDirectory.h" -bool Command::SetParameter(const wxString ¶mName, - const wxVariant ¶mValue) +bool Command::SetParameter(const wxString & WXUNUSED(paramName), + const wxVariant & WXUNUSED(paramValue)) { wxASSERT_MSG(false, wxT("Tried to set parameter for command which doesn't support parameters!")); return false; @@ -211,7 +211,7 @@ bool CommandImplementation::SetParameter(const wxString ¶mName, const wxVari return true; } -bool CommandImplementation::Apply(CommandExecutionContext context) +bool CommandImplementation::Apply(CommandExecutionContext WXUNUSED(context)) { return true; } diff --git a/src/commands/CommandSignature.h b/src/commands/CommandSignature.h index d6d6b5ddd..3ac050c5f 100644 --- a/src/commands/CommandSignature.h +++ b/src/commands/CommandSignature.h @@ -30,7 +30,7 @@ class CommandSignature private: ParamValueMap mDefaults; ValidatorMap mValidators; - explicit CommandSignature(const CommandSignature &other) { } + explicit CommandSignature(const CommandSignature & WXUNUSED(other)) { } public: explicit CommandSignature() { } ~CommandSignature(); diff --git a/src/commands/CommandTargets.h b/src/commands/CommandTargets.h index 84545f309..f683957bf 100644 --- a/src/commands/CommandTargets.h +++ b/src/commands/CommandTargets.h @@ -41,7 +41,7 @@ class NullProgressTarget : public CommandProgressTarget { public: virtual ~NullProgressTarget() {} - virtual void Update(double completed) {} + virtual void Update(double WXUNUSED(completed)) {} }; /// Sends command progress information to a ProgressDialog diff --git a/src/commands/HelpCommand.cpp b/src/commands/HelpCommand.cpp index 3659dd50f..5ff8d98ef 100644 --- a/src/commands/HelpCommand.cpp +++ b/src/commands/HelpCommand.cpp @@ -33,7 +33,7 @@ Command *HelpCommandType::Create(CommandOutputTarget *target) return new HelpCommand(*this, target); } -bool HelpCommand::Apply(CommandExecutionContext context) +bool HelpCommand::Apply(CommandExecutionContext WXUNUSED(context)) { wxString commandName = GetString(wxT("CommandName")); CommandType *type = CommandDirectory::Get()->LookUp(commandName); diff --git a/src/commands/MessageCommand.cpp b/src/commands/MessageCommand.cpp index 6383f1869..7ee3e00da 100644 --- a/src/commands/MessageCommand.cpp +++ b/src/commands/MessageCommand.cpp @@ -32,7 +32,7 @@ Command *MessageCommandType::Create(CommandOutputTarget *target) return new MessageCommand(*this, target); } -bool MessageCommand::Apply(CommandExecutionContext context) +bool MessageCommand::Apply(CommandExecutionContext WXUNUSED(context)) { wxString message = GetString(wxT("MessageString")); Status(message); diff --git a/src/commands/PreferenceCommands.cpp b/src/commands/PreferenceCommands.cpp index 09c0066ef..273f9915a 100644 --- a/src/commands/PreferenceCommands.cpp +++ b/src/commands/PreferenceCommands.cpp @@ -35,7 +35,7 @@ Command *GetPreferenceCommandType::Create(CommandOutputTarget *target) return new GetPreferenceCommand(*this, target); } -bool GetPreferenceCommand::Apply(CommandExecutionContext context) +bool GetPreferenceCommand::Apply(CommandExecutionContext WXUNUSED(context)) { wxString prefName = GetString(wxT("PrefName")); wxString prefValue; @@ -70,7 +70,7 @@ Command *SetPreferenceCommandType::Create(CommandOutputTarget *target) return new SetPreferenceCommand(*this, target); } -bool SetPreferenceCommand::Apply(CommandExecutionContext context) +bool SetPreferenceCommand::Apply(CommandExecutionContext WXUNUSED(context)) { wxString prefName = GetString(wxT("PrefName")); wxString prefValue = GetString(wxT("PrefValue")); diff --git a/src/effects/Amplify.cpp b/src/effects/Amplify.cpp index ebefc6b80..ddb682a4f 100644 --- a/src/effects/Amplify.cpp +++ b/src/effects/Amplify.cpp @@ -250,7 +250,7 @@ void AmplifyDialog::CheckClip() } } -void AmplifyDialog::OnAmpText(wxCommandEvent & event) +void AmplifyDialog::OnAmpText(wxCommandEvent & WXUNUSED(event)) { wxString val = mAmpT->GetValue(); double r; @@ -269,7 +269,7 @@ void AmplifyDialog::OnAmpText(wxCommandEvent & event) CheckClip(); } -void AmplifyDialog::OnPeakText(wxCommandEvent & event) +void AmplifyDialog::OnPeakText(wxCommandEvent & WXUNUSED(event)) { wxString val = mPeakT->GetValue(); double r; @@ -288,7 +288,7 @@ void AmplifyDialog::OnPeakText(wxCommandEvent & event) CheckClip(); } -void AmplifyDialog::OnAmpSlider(wxCommandEvent & event) +void AmplifyDialog::OnAmpSlider(wxCommandEvent & WXUNUSED(event)) { wxString str; @@ -313,12 +313,12 @@ void AmplifyDialog::OnAmpSlider(wxCommandEvent & event) CheckClip(); } -void AmplifyDialog::OnClipCheckBox(wxCommandEvent & event) +void AmplifyDialog::OnClipCheckBox(wxCommandEvent & WXUNUSED(event)) { CheckClip(); } -void AmplifyDialog::OnPreview(wxCommandEvent &event) +void AmplifyDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp index 789658611..3977c330b 100644 --- a/src/effects/ChangeSpeed.cpp +++ b/src/effects/ChangeSpeed.cpp @@ -503,7 +503,7 @@ void ChangeSpeedDialog::OnChoice_ToVinyl(wxCommandEvent & WXUNUSED(event)) } } -void ChangeSpeedDialog::OnPreview(wxCommandEvent &event) +void ChangeSpeedDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); diff --git a/src/effects/ClickRemoval.cpp b/src/effects/ClickRemoval.cpp index 758432d6a..0710b86e7 100644 --- a/src/effects/ClickRemoval.cpp +++ b/src/effects/ClickRemoval.cpp @@ -387,7 +387,7 @@ bool ClickRemovalDialog::TransferDataFromWindow() // WDR: handler implementations for ClickRemovalDialog -void ClickRemovalDialog::OnWidthText(wxCommandEvent & event) +void ClickRemovalDialog::OnWidthText(wxCommandEvent & WXUNUSED(event)) { long val; @@ -395,7 +395,7 @@ void ClickRemovalDialog::OnWidthText(wxCommandEvent & event) mWidthS->SetValue(TrapLong(val, MIN_CLICK_WIDTH, MAX_CLICK_WIDTH)); } -void ClickRemovalDialog::OnThreshText(wxCommandEvent & event) +void ClickRemovalDialog::OnThreshText(wxCommandEvent & WXUNUSED(event)) { long val; @@ -403,17 +403,17 @@ void ClickRemovalDialog::OnThreshText(wxCommandEvent & event) mThreshS->SetValue(TrapLong(val, MIN_THRESHOLD, MAX_THRESHOLD)); } -void ClickRemovalDialog::OnWidthSlider(wxCommandEvent & event) +void ClickRemovalDialog::OnWidthSlider(wxCommandEvent & WXUNUSED(event)) { mWidthT->SetValue(wxString::Format(wxT("%d"), mWidthS->GetValue())); } -void ClickRemovalDialog::OnThreshSlider(wxCommandEvent & event) +void ClickRemovalDialog::OnThreshSlider(wxCommandEvent & WXUNUSED(event)) { mThreshT->SetValue(wxString::Format(wxT("%d"), mThreshS->GetValue())); } -void ClickRemovalDialog::OnPreview(wxCommandEvent & event) +void ClickRemovalDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); mEffect->mThresholdLevel = mThresh; diff --git a/src/effects/Compressor.cpp b/src/effects/Compressor.cpp index 460ea3f59..a9da96270 100644 --- a/src/effects/Compressor.cpp +++ b/src/effects/Compressor.cpp @@ -450,7 +450,7 @@ CompressorPanel::CompressorPanel( wxWindow *parent, wxWindowID id, mHeight = 0; } -void CompressorPanel::OnPaint(wxPaintEvent & evt) +void CompressorPanel::OnPaint(wxPaintEvent & WXUNUSED(event)) { wxPaintDC dc(this); @@ -756,7 +756,7 @@ void CompressorDialog::OnSize(wxSizeEvent &event) event.Skip(); } -void CompressorDialog::OnPreview(wxCommandEvent &event) +void CompressorDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); @@ -788,7 +788,7 @@ void CompressorDialog::OnPreview(wxCommandEvent &event) mEffect->mUsePeak = oldUsePeak; } -void CompressorDialog::OnSlider(wxCommandEvent &event) +void CompressorDialog::OnSlider(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); } diff --git a/src/effects/Contrast.cpp b/src/effects/Contrast.cpp index 905ebc6c7..b2e6d6f64 100644 --- a/src/effects/Contrast.cpp +++ b/src/effects/Contrast.cpp @@ -376,7 +376,7 @@ ContrastDialog::~ContrastDialog() mDiffText->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(ContrastDialog::OnChar)); } -void ContrastDialog::OnGetForegroundDB( wxCommandEvent &event ) +void ContrastDialog::OnGetForegroundDB( wxCommandEvent & WXUNUSED(event)) { SetStartTime(mForegroundStartT->GetTimeValue()); SetEndTime(mForegroundEndT->GetTimeValue()); @@ -385,7 +385,7 @@ void ContrastDialog::OnGetForegroundDB( wxCommandEvent &event ) results(); } -void ContrastDialog::OnGetBackgroundDB( wxCommandEvent &event ) +void ContrastDialog::OnGetBackgroundDB( wxCommandEvent & WXUNUSED(event)) { SetStartTime(mBackgroundStartT->GetTimeValue()); SetEndTime(mBackgroundEndT->GetTimeValue()); @@ -394,13 +394,13 @@ void ContrastDialog::OnGetBackgroundDB( wxCommandEvent &event ) results(); } -void ContrastDialog::OnGetURL(wxCommandEvent &event) +void ContrastDialog::OnGetURL(wxCommandEvent & WXUNUSED(event)) { wxString page = wxT("http://www.eramp.com/WCAG_2_audio_contrast_tool_help.htm"); ::OpenInDefaultBrowser(page); } -void ContrastDialog::OnClose(wxCommandEvent &event) +void ContrastDialog::OnClose(wxCommandEvent & WXUNUSED(event)) { Show(false); } @@ -492,7 +492,7 @@ void ContrastDialog::results() } } -void ContrastDialog::OnExport(wxCommandEvent & event) +void ContrastDialog::OnExport(wxCommandEvent & WXUNUSED(event)) { AudacityProject * project = GetActiveProject(); wxString fName = wxT("contrast.txt"); @@ -616,7 +616,7 @@ void ContrastDialog::OnReset(wxCommandEvent & event) results(); } -void ContrastDialog::OnChar(wxKeyEvent &event) +void ContrastDialog::OnChar(wxKeyEvent & event) { event.Skip(false); return; diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp index 7e7eaa443..58057b51a 100644 --- a/src/effects/DtmfGen.cpp +++ b/src/effects/DtmfGen.cpp @@ -120,7 +120,7 @@ bool EffectDtmf::PromptUser() } -bool EffectDtmf::TransferParameters( Shuttle & shuttle ) +bool EffectDtmf::TransferParameters( Shuttle & WXUNUSED(shuttle) ) { return true; } @@ -572,19 +572,19 @@ void DtmfDialog::Recalculate(void) { mDtmfToneT->SetName(mDtmfToneT->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs) } -void DtmfDialog::OnDutyCycleSlider(wxCommandEvent & event) { +void DtmfDialog::OnDutyCycleSlider(wxCommandEvent & WXUNUSED(event)) { Recalculate(); } -void DtmfDialog::OnDtmfStringText(wxCommandEvent & event) { +void DtmfDialog::OnDtmfStringText(wxCommandEvent & WXUNUSED(event)) { Recalculate(); } -void DtmfDialog::OnDtmfDurationText(wxCommandEvent & event) { +void DtmfDialog::OnDtmfDurationText(wxCommandEvent & WXUNUSED(event)) { Recalculate(); } -void DtmfDialog::OnTimeCtrlUpdate(wxCommandEvent & event) { +void DtmfDialog::OnTimeCtrlUpdate(wxCommandEvent & WXUNUSED(event)) { this->Fit(); } diff --git a/src/effects/Echo.cpp b/src/effects/Echo.cpp index e8cee2044..80ce745cf 100644 --- a/src/effects/Echo.cpp +++ b/src/effects/Echo.cpp @@ -246,7 +246,7 @@ bool EchoDialog::TransferDataFromWindow() // handler implementations for EchoDialog -void EchoDialog::OnPreview(wxCommandEvent &event) +void EchoDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index 3ac7486a4..9cf472bbc 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -592,7 +592,7 @@ void EffectDialog::Init() /// This is a virtual function which will be overridden to /// provide the actual parameters that we want for each /// kind of dialog. -void EffectDialog::PopulateOrExchange(ShuttleGui & S) +void EffectDialog::PopulateOrExchange(ShuttleGui & WXUNUSED(S)) { return; } @@ -618,7 +618,7 @@ bool EffectDialog::Validate() return true; } -void EffectDialog::OnPreview(wxCommandEvent & event) +void EffectDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { return; } diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index e3a4e6ff3..f8ca7e0d8 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -653,12 +653,12 @@ void EqualizationPanel::Recalc() #endif // EXPERIMENTAL_USE_REALFFTF } -void EqualizationPanel::OnSize(wxSizeEvent & evt) +void EqualizationPanel::OnSize(wxSizeEvent & WXUNUSED(event)) { Refresh( false ); } -void EqualizationPanel::OnPaint(wxPaintEvent & evt) +void EqualizationPanel::OnPaint(wxPaintEvent & WXUNUSED(event)) { wxPaintDC dc(this); if(RecalcRequired) { @@ -843,7 +843,7 @@ void EqualizationPanel::OnMouseEvent(wxMouseEvent & event) } } -void EqualizationPanel::OnCaptureLost(wxMouseCaptureLostEvent & event) +void EqualizationPanel::OnCaptureLost(wxMouseCaptureLostEvent & WXUNUSED(event)) { if (HasCapture()) { @@ -1962,7 +1962,7 @@ void EqualizationDialog::WriteXML(XMLWriter &xmlFile) // Graphic EQ slider was adjusted // -void EqualizationDialog::OnSlider(wxCommandEvent &event) +void EqualizationDialog::OnSlider(wxCommandEvent & event) { wxSliderBugfix *s = (wxSliderBugfix *)event.GetEventObject(); for (int i = 0; thirdOct[i] <= mHiFreq; ++i) @@ -2004,7 +2004,7 @@ void EqualizationDialog::OnSlider(wxCommandEvent &event) EnvelopeUpdated(); } -void EqualizationDialog::OnInterp(wxCommandEvent &event) +void EqualizationDialog::OnInterp(wxCommandEvent & WXUNUSED(event)) { if(mFaderOrDraw[1]->GetValue()) { @@ -2235,7 +2235,7 @@ double EqualizationDialog::splint(double x[], double y[], int n, double y2[], do return( a*y[k]+b*y[k+1]+((a*a*a-a)*y2[k]+(b*b*b-b)*y2[k+1])*h*h/6.); } -void EqualizationDialog::OnDrawRadio(wxCommandEvent &evt) +void EqualizationDialog::OnDrawRadio(wxCommandEvent & WXUNUSED(event)) { int numPoints = mLogEnvelope->GetNumberOfPoints(); double *when = new double[ numPoints ]; @@ -2290,7 +2290,7 @@ void EqualizationDialog::OnDrawRadio(wxCommandEvent &evt) drawMode = true; } -void EqualizationDialog::OnSliderRadio(wxCommandEvent &evt) +void EqualizationDialog::OnSliderRadio(wxCommandEvent & WXUNUSED(event)) { UpdateGraphic(); } @@ -2368,7 +2368,7 @@ void EqualizationDialog::UpdateGraphic() drawMode = false; } -void EqualizationDialog::OnLinFreq(wxCommandEvent &evt) +void EqualizationDialog::OnLinFreq(wxCommandEvent & WXUNUSED(event)) { if(mLinFreq->IsChecked()) //going from log to lin freq scale { @@ -2546,18 +2546,18 @@ void EqualizationDialog::ErrMin(void) testEnvelope = NULL; } -void EqualizationDialog::OnSliderM(wxCommandEvent &event) +void EqualizationDialog::OnSliderM(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); mPanel->RecalcRequired = true; } -void EqualizationDialog::OnSliderDBMIN(wxCommandEvent &event) +void EqualizationDialog::OnSliderDBMIN(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); } -void EqualizationDialog::OnSliderDBMAX(wxCommandEvent &event) +void EqualizationDialog::OnSliderDBMAX(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); } @@ -2565,7 +2565,7 @@ void EqualizationDialog::OnSliderDBMAX(wxCommandEvent &event) // // New curve was selected // -void EqualizationDialog::OnCurve(wxCommandEvent &event) +void EqualizationDialog::OnCurve(wxCommandEvent & WXUNUSED(event)) { // Select new curve #if wxCHECK_VERSION(2, 6, 2) && !defined(__WXX11__) @@ -2580,13 +2580,13 @@ void EqualizationDialog::OnCurve(wxCommandEvent &event) // // User wants to modify the list in some way // -void EqualizationDialog::OnManage(wxCommandEvent &event) +void EqualizationDialog::OnManage(wxCommandEvent & WXUNUSED(event)) { EditCurvesDialog d(this, mCurve->GetSelection()); d.ShowModal(); } -void EqualizationDialog::OnClear(wxCommandEvent &event) +void EqualizationDialog::OnClear(wxCommandEvent & WXUNUSED(event)) { mLogEnvelope->Flatten(0.); mLogEnvelope->SetTrackLen(1.0); @@ -2614,7 +2614,7 @@ void EqualizationDialog::OnClear(wxCommandEvent &event) EnvelopeUpdated(); } -void EqualizationDialog::OnInvert(wxCommandEvent &event) // Inverts any curve +void EqualizationDialog::OnInvert(wxCommandEvent & WXUNUSED(event)) // Inverts any curve { if(!drawMode) // Graphic (Slider) mode. Invert the sliders. { @@ -2691,12 +2691,12 @@ void EqualizationDialog::OnInvert(wxCommandEvent &event) // Inverts any curve EnvelopeUpdated(); } -void EqualizationDialog::OnErase(wxEraseEvent &event) +void EqualizationDialog::OnErase(wxEraseEvent & WXUNUSED(event)) { // Ignore it } -void EqualizationDialog::OnPaint(wxPaintEvent &event) +void EqualizationDialog::OnPaint(wxPaintEvent & WXUNUSED(event)) { wxPaintDC dc(this); @@ -2707,7 +2707,7 @@ void EqualizationDialog::OnPaint(wxPaintEvent &event) dc.Clear(); } -void EqualizationDialog::OnSize(wxSizeEvent &event) +void EqualizationDialog::OnSize(wxSizeEvent & event) { Layout(); @@ -2719,7 +2719,7 @@ void EqualizationDialog::OnSize(wxSizeEvent &event) event.Skip(); } -void EqualizationDialog::OnPreview(wxCommandEvent &event) +void EqualizationDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); m_pEffect->Preview(); @@ -2759,7 +2759,7 @@ void EqualizationDialog::Finish(bool ok) EndModal(ok); } -void EqualizationDialog::OnCancel(wxCommandEvent &event) +void EqualizationDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) { if (mDisallowCustom) RevertCustom(); @@ -2767,7 +2767,7 @@ void EqualizationDialog::OnCancel(wxCommandEvent &event) Finish(false); } -void EqualizationDialog::OnOk(wxCommandEvent &event) +void EqualizationDialog::OnOk(wxCommandEvent & event) { TransferDataFromWindow(); @@ -2911,7 +2911,7 @@ void EditCurvesDialog::PopulateList(int position) mList->SetItemState(position, wxLIST_STATE_SELECTED|wxLIST_STATE_FOCUSED, wxLIST_STATE_SELECTED|wxLIST_STATE_FOCUSED); } -void EditCurvesDialog::OnUp(wxCommandEvent &event) +void EditCurvesDialog::OnUp(wxCommandEvent & WXUNUSED(event)) { long item = mList->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if ( item == -1 ) @@ -2946,7 +2946,7 @@ void EditCurvesDialog::OnUp(wxCommandEvent &event) } } -void EditCurvesDialog::OnDown(wxCommandEvent &event) +void EditCurvesDialog::OnDown(wxCommandEvent & WXUNUSED(event)) { // looks harder than OnUp as we need to seek backwards up the list, hence GetPreviousItem long item = GetPreviousItem(mList->GetItemCount()); if( item == -1 ) @@ -2991,7 +2991,7 @@ long EditCurvesDialog::GetPreviousItem(long item) // wx doesn't have this } // Rename curve/curves -void EditCurvesDialog::OnRename(wxCommandEvent &event) +void EditCurvesDialog::OnRename(wxCommandEvent & WXUNUSED(event)) { wxString name; int numCurves = mEditCurves.GetCount(); @@ -3100,7 +3100,7 @@ void EditCurvesDialog::OnRename(wxCommandEvent &event) } // Delete curve/curves -void EditCurvesDialog::OnDelete(wxCommandEvent &event) +void EditCurvesDialog::OnDelete(wxCommandEvent & WXUNUSED(event)) { // We could could count them here // And then put in a 'Delete N items?' prompt. @@ -3180,7 +3180,7 @@ void EditCurvesDialog::OnDelete(wxCommandEvent &event) #endif } -void EditCurvesDialog::OnImport( wxCommandEvent &event ) +void EditCurvesDialog::OnImport( wxCommandEvent & WXUNUSED(event)) { wxFileDialog filePicker(this, _("Choose an EQ curve file"), FileNames::DataDir(), wxT(""), _("xml files (*.xml;*.XML)|*.xml;*.XML")); wxString fileName = wxT(""); @@ -3200,7 +3200,7 @@ void EditCurvesDialog::OnImport( wxCommandEvent &event ) return; } -void EditCurvesDialog::OnExport( wxCommandEvent &event ) +void EditCurvesDialog::OnExport( wxCommandEvent & WXUNUSED(event)) { wxFileDialog filePicker(this, _("Export EQ curves as..."), FileNames::DataDir(), wxT(""), wxT("*.XML"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT | wxRESIZE_BORDER); // wxFD_CHANGE_DIR? wxString fileName = wxT(""); @@ -3241,12 +3241,12 @@ void EditCurvesDialog::OnExport( wxCommandEvent &event ) wxMessageBox(_("No curves exported"), _("No curves exported")); } -void EditCurvesDialog::OnLibrary( wxCommandEvent &event ) +void EditCurvesDialog::OnLibrary( wxCommandEvent & WXUNUSED(event)) { wxLaunchDefaultBrowser(wxT("http://wiki.audacityteam.org/wiki/EQCurvesDownload")); } -void EditCurvesDialog::OnDefaults( wxCommandEvent &event ) +void EditCurvesDialog::OnDefaults( wxCommandEvent & WXUNUSED(event)) { EQCurveArray temp; temp = mParent->mCurves; @@ -3257,7 +3257,7 @@ void EditCurvesDialog::OnDefaults( wxCommandEvent &event ) PopulateList(0); // update the EditCurvesDialog dialog } -void EditCurvesDialog::OnOK(wxCommandEvent &event) +void EditCurvesDialog::OnOK(wxCommandEvent & WXUNUSED(event)) { // Make a backup of the current curves wxString backupPlace = wxFileName( FileNames::DataDir(), wxT("EQBackup.xml") ).GetFullPath(); diff --git a/src/effects/Noise.cpp b/src/effects/Noise.cpp index 18301ad9b..c3c51ff27 100644 --- a/src/effects/Noise.cpp +++ b/src/effects/Noise.cpp @@ -89,7 +89,7 @@ bool EffectNoise::PromptUser() return true; } -bool EffectNoise::TransferParameters( Shuttle & shuttle ) +bool EffectNoise::TransferParameters( Shuttle & WXUNUSED(shuttle) ) { return true; } @@ -245,6 +245,6 @@ bool NoiseDialog::TransferDataFromWindow() return true; } -void NoiseDialog::OnTimeCtrlUpdate(wxCommandEvent & event) { +void NoiseDialog::OnTimeCtrlUpdate(wxCommandEvent & WXUNUSED(event)) { Fit(); } diff --git a/src/effects/NoiseRemoval.cpp b/src/effects/NoiseRemoval.cpp index d294c29e6..574dab677 100644 --- a/src/effects/NoiseRemoval.cpp +++ b/src/effects/NoiseRemoval.cpp @@ -174,7 +174,7 @@ bool EffectNoiseRemoval::PromptUser() return gPrefs->Flush(); } -bool EffectNoiseRemoval::TransferParameters( Shuttle & shuttle ) +bool EffectNoiseRemoval::TransferParameters( Shuttle & WXUNUSED(shuttle) ) { //shuttle.TransferDouble(wxT("Gain"), mNoiseGain, 0.0); //shuttle.TransferDouble(wxT("Freq"), mFreqSmoothingHz, 0.0); @@ -679,17 +679,17 @@ NoiseRemovalDialog::NoiseRemovalDialog(EffectNoiseRemoval * effect, (wxButton *)wxWindow::FindWindowById(wxID_OK, this); } -void NoiseRemovalDialog::OnGetProfile( wxCommandEvent &event ) +void NoiseRemovalDialog::OnGetProfile( wxCommandEvent & WXUNUSED(event)) { EndModal(1); } -void NoiseRemovalDialog::OnKeepNoise( wxCommandEvent &event ) +void NoiseRemovalDialog::OnKeepNoise( wxCommandEvent & WXUNUSED(event)) { mbLeaveNoise = mKeepNoise->GetValue(); } -void NoiseRemovalDialog::OnPreview(wxCommandEvent &event) +void NoiseRemovalDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { // Save & restore parameters around Preview, because we didn't do OK. bool oldDoProfile = m_pEffect->mDoProfile; @@ -718,13 +718,13 @@ void NoiseRemovalDialog::OnPreview(wxCommandEvent &event) m_pEffect->mDoProfile = oldDoProfile; } -void NoiseRemovalDialog::OnRemoveNoise( wxCommandEvent &event ) +void NoiseRemovalDialog::OnRemoveNoise( wxCommandEvent & WXUNUSED(event)) { mbLeaveNoise = mKeepNoise->GetValue(); EndModal(2); } -void NoiseRemovalDialog::OnCancel(wxCommandEvent &event) +void NoiseRemovalDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) { EndModal(0); } @@ -818,49 +818,49 @@ bool NoiseRemovalDialog::TransferDataFromWindow() return true; } -void NoiseRemovalDialog::OnSensitivityText(wxCommandEvent & event) +void NoiseRemovalDialog::OnSensitivityText(wxCommandEvent & WXUNUSED(event)) { mSensitivityT->GetValue().ToDouble(&mSensitivity); mSensitivityS->SetValue(TrapLong(mSensitivity*100.0 + (SENSITIVITY_MAX-SENSITIVITY_MIN+1)/2.0, SENSITIVITY_MIN, SENSITIVITY_MAX)); } -void NoiseRemovalDialog::OnGainText(wxCommandEvent & event) +void NoiseRemovalDialog::OnGainText(wxCommandEvent & WXUNUSED(event)) { mGainT->GetValue().ToDouble(&mGain); mGainS->SetValue(TrapLong(mGain, GAIN_MIN, GAIN_MAX)); } -void NoiseRemovalDialog::OnFreqText(wxCommandEvent & event) +void NoiseRemovalDialog::OnFreqText(wxCommandEvent & WXUNUSED(event)) { mFreqT->GetValue().ToDouble(&mFreq); mFreqS->SetValue(TrapLong(mFreq / 10, FREQ_MIN, FREQ_MAX)); } -void NoiseRemovalDialog::OnTimeText(wxCommandEvent & event) +void NoiseRemovalDialog::OnTimeText(wxCommandEvent & WXUNUSED(event)) { mTimeT->GetValue().ToDouble(&mTime); mTimeS->SetValue(TrapLong(mTime * TIME_MAX + 0.5, TIME_MIN, TIME_MAX)); } -void NoiseRemovalDialog::OnSensitivitySlider(wxCommandEvent & event) +void NoiseRemovalDialog::OnSensitivitySlider(wxCommandEvent & WXUNUSED(event)) { mSensitivity = mSensitivityS->GetValue()/100.0 - 20.0; mSensitivityT->SetValue(wxString::Format(wxT("%.2f"), mSensitivity)); } -void NoiseRemovalDialog::OnGainSlider(wxCommandEvent & event) +void NoiseRemovalDialog::OnGainSlider(wxCommandEvent & WXUNUSED(event)) { mGain = mGainS->GetValue(); mGainT->SetValue(wxString::Format(wxT("%d"), (int)mGain)); } -void NoiseRemovalDialog::OnFreqSlider(wxCommandEvent & event) +void NoiseRemovalDialog::OnFreqSlider(wxCommandEvent & WXUNUSED(event)) { mFreq = mFreqS->GetValue() * 10; mFreqT->SetValue(wxString::Format(wxT("%d"), (int)mFreq)); } -void NoiseRemovalDialog::OnTimeSlider(wxCommandEvent & event) +void NoiseRemovalDialog::OnTimeSlider(wxCommandEvent & WXUNUSED(event)) { mTime = mTimeS->GetValue() / (TIME_MAX*1.0); mTimeT->SetValue(wxString::Format(wxT("%.2f"), mTime)); diff --git a/src/effects/Normalize.cpp b/src/effects/Normalize.cpp index 6fdf09f0b..0fb792eb9 100644 --- a/src/effects/Normalize.cpp +++ b/src/effects/Normalize.cpp @@ -520,7 +520,7 @@ bool NormalizeDialog::TransferDataFromWindow() return true; } -void NormalizeDialog::OnUpdateUI(wxCommandEvent& evt) +void NormalizeDialog::OnUpdateUI(wxCommandEvent& WXUNUSED(event)) { UpdateUI(); } @@ -562,7 +562,7 @@ void NormalizeDialog::UpdateUI() mWarning->SetLabel(wxT("")); } -void NormalizeDialog::OnPreview(wxCommandEvent &event) +void NormalizeDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); diff --git a/src/effects/Paulstretch.cpp b/src/effects/Paulstretch.cpp index 8569e4295..be3f8b39b 100644 --- a/src/effects/Paulstretch.cpp +++ b/src/effects/Paulstretch.cpp @@ -129,7 +129,7 @@ class PaulStretch{ protected: - virtual void process_spectrum(float *freq){}; + virtual void process_spectrum(float *WXUNUSED(freq)){}; float samplerate; private: float *in_pool;//de marimea in_bufsize @@ -464,7 +464,7 @@ bool PaulstretchDialog::TransferDataFromWindow(){ return true; } -void PaulstretchDialog::OnPreview(wxCommandEvent &event){ +void PaulstretchDialog::OnPreview(wxCommandEvent & WXUNUSED(event)){ TransferDataFromWindow(); // Save & restore parameters around Preview, because we didn't do OK. diff --git a/src/effects/Phaser.cpp b/src/effects/Phaser.cpp index ec3c73d5e..5e47773ab 100644 --- a/src/effects/Phaser.cpp +++ b/src/effects/Phaser.cpp @@ -406,7 +406,7 @@ bool PhaserDialog::TransferDataFromWindow() // WDR: handler implementations for PhaserDialog -void PhaserDialog::OnStagesSlider(wxCommandEvent & event) +void PhaserDialog::OnStagesSlider(wxCommandEvent & WXUNUSED(event)) { wxString str; long stage = GetStagesSlider()->GetValue(); @@ -414,7 +414,7 @@ void PhaserDialog::OnStagesSlider(wxCommandEvent & event) GetStagesText()->SetValue(str); } -void PhaserDialog::OnDryWetSlider(wxCommandEvent & event) +void PhaserDialog::OnDryWetSlider(wxCommandEvent & WXUNUSED(event)) { wxString str; long drywet = GetDryWetSlider()->GetValue(); @@ -422,7 +422,7 @@ void PhaserDialog::OnDryWetSlider(wxCommandEvent & event) GetDryWetText()->SetValue(str); } -void PhaserDialog::OnFeedbackSlider(wxCommandEvent & event) +void PhaserDialog::OnFeedbackSlider(wxCommandEvent & WXUNUSED(event)) { wxString str; long fb = GetFeedbackSlider()->GetValue(); @@ -434,7 +434,7 @@ void PhaserDialog::OnFeedbackSlider(wxCommandEvent & event) GetFeedbackText()->SetValue(str); } -void PhaserDialog::OnDepthSlider(wxCommandEvent & event) +void PhaserDialog::OnDepthSlider(wxCommandEvent & WXUNUSED(event)) { wxString str; long depth = GetDepthSlider()->GetValue(); @@ -442,7 +442,7 @@ void PhaserDialog::OnDepthSlider(wxCommandEvent & event) GetDepthText()->SetValue(str); } -void PhaserDialog::OnPhaseSlider(wxCommandEvent & event) +void PhaserDialog::OnPhaseSlider(wxCommandEvent & WXUNUSED(event)) { wxString str; long phase = GetPhaseSlider()->GetValue(); @@ -451,7 +451,7 @@ void PhaserDialog::OnPhaseSlider(wxCommandEvent & event) GetPhaseText()->SetValue(str); } -void PhaserDialog::OnFreqSlider(wxCommandEvent & event) +void PhaserDialog::OnFreqSlider(wxCommandEvent & WXUNUSED(event)) { wxString str; long freq = GetFreqSlider()->GetValue(); @@ -459,7 +459,7 @@ void PhaserDialog::OnFreqSlider(wxCommandEvent & event) GetFreqText()->SetValue(str); } -void PhaserDialog::OnStagesText(wxCommandEvent & event) +void PhaserDialog::OnStagesText(wxCommandEvent & WXUNUSED(event)) { wxTextCtrl *c = GetStagesText(); if (c) { @@ -474,7 +474,7 @@ void PhaserDialog::OnStagesText(wxCommandEvent & event) } } -void PhaserDialog::OnDryWetText(wxCommandEvent & event) +void PhaserDialog::OnDryWetText(wxCommandEvent & WXUNUSED(event)) { wxTextCtrl *c = GetDryWetText(); if (c) { @@ -489,7 +489,7 @@ void PhaserDialog::OnDryWetText(wxCommandEvent & event) } } -void PhaserDialog::OnFeedbackText(wxCommandEvent & event) +void PhaserDialog::OnFeedbackText(wxCommandEvent & WXUNUSED(event)) { wxTextCtrl *c = GetFeedbackText(); if (c) { @@ -504,7 +504,7 @@ void PhaserDialog::OnFeedbackText(wxCommandEvent & event) } } -void PhaserDialog::OnDepthText(wxCommandEvent & event) +void PhaserDialog::OnDepthText(wxCommandEvent & WXUNUSED(event)) { wxTextCtrl *c = GetDepthText(); if (c) { @@ -519,7 +519,7 @@ void PhaserDialog::OnDepthText(wxCommandEvent & event) } } -void PhaserDialog::OnPhaseText(wxCommandEvent & event) +void PhaserDialog::OnPhaseText(wxCommandEvent & WXUNUSED(event)) { wxTextCtrl *c = GetPhaseText(); if (c) { @@ -534,7 +534,7 @@ void PhaserDialog::OnPhaseText(wxCommandEvent & event) } } -void PhaserDialog::OnFreqText(wxCommandEvent & event) +void PhaserDialog::OnFreqText(wxCommandEvent & WXUNUSED(event)) { wxTextCtrl *c = GetFreqText(); if (c) { @@ -549,7 +549,7 @@ void PhaserDialog::OnFreqText(wxCommandEvent & event) } } -void PhaserDialog::OnPreview(wxCommandEvent &event) +void PhaserDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); diff --git a/src/effects/Repair.cpp b/src/effects/Repair.cpp index 9a07dfd86..114d55aa0 100644 --- a/src/effects/Repair.cpp +++ b/src/effects/Repair.cpp @@ -45,7 +45,7 @@ bool EffectRepair::PromptUser() return true; } -bool EffectRepair::TransferParameters( Shuttle & shuttle ) +bool EffectRepair::TransferParameters( Shuttle & WXUNUSED(shuttle) ) { //TODO: pop-click values. // shuttle.TransferInt("",,0); diff --git a/src/effects/Repeat.cpp b/src/effects/Repeat.cpp index 8e3a43386..264356ac1 100644 --- a/src/effects/Repeat.cpp +++ b/src/effects/Repeat.cpp @@ -269,14 +269,14 @@ void RepeatDialog::DisplayNewTime() mTotalTime->SetName(str); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs) } -void RepeatDialog::OnRepeatTextChange(wxCommandEvent & event) +void RepeatDialog::OnRepeatTextChange(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); DisplayNewTime(); } -void RepeatDialog::OnPreview(wxCommandEvent &event) +void RepeatDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); diff --git a/src/effects/Silence.cpp b/src/effects/Silence.cpp index 3dbf2a526..09f2eb873 100644 --- a/src/effects/Silence.cpp +++ b/src/effects/Silence.cpp @@ -62,8 +62,8 @@ bool EffectSilence::PromptUser() } bool EffectSilence::GenerateTrack(WaveTrack *tmp, - const WaveTrack &track, - int ntrack) + const WaveTrack & WXUNUSED(track), + int WXUNUSED(ntrack)) { const bool bResult = tmp->InsertSilence(0.0, mDuration); wxASSERT(bResult); diff --git a/src/effects/TimeScale.cpp b/src/effects/TimeScale.cpp index b994e4abe..2763bcf27 100644 --- a/src/effects/TimeScale.cpp +++ b/src/effects/TimeScale.cpp @@ -383,7 +383,7 @@ bool TimeScaleDialog::CheckParameters() // handler implementations for TimeScaleDialog -void TimeScaleDialog::OnText_RatePercentChangeStart(wxCommandEvent & event) +void TimeScaleDialog::OnText_RatePercentChangeStart(wxCommandEvent & WXUNUSED(event)) { if (m_bLoopDetect) return; @@ -402,7 +402,7 @@ void TimeScaleDialog::OnText_RatePercentChangeStart(wxCommandEvent & event) } } -void TimeScaleDialog::OnText_RatePercentChangeEnd(wxCommandEvent & event) +void TimeScaleDialog::OnText_RatePercentChangeEnd(wxCommandEvent & WXUNUSED(event)) { if (m_bLoopDetect) return; @@ -421,7 +421,7 @@ void TimeScaleDialog::OnText_RatePercentChangeEnd(wxCommandEvent & event) } } -void TimeScaleDialog::OnSlider_RatePercentChangeStart(wxCommandEvent & event) +void TimeScaleDialog::OnSlider_RatePercentChangeStart(wxCommandEvent & WXUNUSED(event)) { if (m_bLoopDetect) return; @@ -435,7 +435,7 @@ void TimeScaleDialog::OnSlider_RatePercentChangeStart(wxCommandEvent & event) } } -void TimeScaleDialog::OnSlider_RatePercentChangeEnd(wxCommandEvent & event) +void TimeScaleDialog::OnSlider_RatePercentChangeEnd(wxCommandEvent & WXUNUSED(event)) { if (m_bLoopDetect) return; @@ -449,7 +449,7 @@ void TimeScaleDialog::OnSlider_RatePercentChangeEnd(wxCommandEvent & event) } } -void TimeScaleDialog::OnText_PitchHalfStepsStart(wxCommandEvent & event) +void TimeScaleDialog::OnText_PitchHalfStepsStart(wxCommandEvent & WXUNUSED(event)) { if (m_bLoopDetect) return; @@ -469,7 +469,7 @@ void TimeScaleDialog::OnText_PitchHalfStepsStart(wxCommandEvent & event) } } -void TimeScaleDialog::OnText_PitchHalfStepsEnd(wxCommandEvent & event) +void TimeScaleDialog::OnText_PitchHalfStepsEnd(wxCommandEvent & WXUNUSED(event)) { if (m_bLoopDetect) return; @@ -489,7 +489,7 @@ void TimeScaleDialog::OnText_PitchHalfStepsEnd(wxCommandEvent & event) } } -void TimeScaleDialog::OnText_PitchPercentChangeStart(wxCommandEvent & event) +void TimeScaleDialog::OnText_PitchPercentChangeStart(wxCommandEvent & WXUNUSED(event)) { if (m_bLoopDetect) return; @@ -509,7 +509,7 @@ void TimeScaleDialog::OnText_PitchPercentChangeStart(wxCommandEvent & event) } } -void TimeScaleDialog::OnText_PitchPercentChangeEnd(wxCommandEvent & event) +void TimeScaleDialog::OnText_PitchPercentChangeEnd(wxCommandEvent & WXUNUSED(event)) { if (m_bLoopDetect) return; @@ -529,7 +529,7 @@ void TimeScaleDialog::OnText_PitchPercentChangeEnd(wxCommandEvent & event) } } -void TimeScaleDialog::OnCheckBox_PreAnalyze(wxCommandEvent & event) +void TimeScaleDialog::OnCheckBox_PreAnalyze(wxCommandEvent & WXUNUSED(event)) { if (m_pCheckBox_PreAnalyze) { m_PreAnalyze = m_pCheckBox_PreAnalyze->GetValue(); diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp index c02e1742c..c9c1d4d84 100644 --- a/src/effects/ToneGen.cpp +++ b/src/effects/ToneGen.cpp @@ -130,7 +130,7 @@ bool EffectToneGen::PromptUser() return true; } -bool EffectToneGen::TransferParameters( Shuttle & shuttle ) +bool EffectToneGen::TransferParameters( Shuttle & WXUNUSED(shuttle) ) { /// \todo this should in time be using ShuttleGui too. // shuttle.TransferInt("",,0); @@ -148,7 +148,7 @@ bool EffectToneGen::MakeTone(float *buffer, sampleCount len) double frequencyQuantum; double BlendedFrequency; double BlendedAmplitude; - double BlendedLogFrequency; + double BlendedLogFrequency = 0.0f; // calculate delta, and reposition from where we left double amplitudeQuantum = (amplitude[1]-amplitude[0]) / numSamples; @@ -222,7 +222,7 @@ void EffectToneGen::BeforeGenerate() } void EffectToneGen::GenerateBlock(float *data, - const WaveTrack &track, + const WaveTrack & WXUNUSED(track), sampleCount block) { MakeTone(data, block); @@ -371,7 +371,7 @@ bool ToneGenDialog::TransferDataFromWindow() return true; } -void ToneGenDialog::OnTimeCtrlUpdate(wxCommandEvent & event) { +void ToneGenDialog::OnTimeCtrlUpdate(wxCommandEvent & WXUNUSED(event)) { Fit(); } diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp index c7e228737..e91d1423f 100644 --- a/src/effects/TruncSilence.cpp +++ b/src/effects/TruncSilence.cpp @@ -555,13 +555,13 @@ void TruncSilenceDialog::PopulateOrExchange(ShuttleGui & S) pWarning = S.AddVariableText( wxT("") ); } -void TruncSilenceDialog::OnPreview(wxCommandEvent & event) +void TruncSilenceDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); mEffect->Preview(); } -void TruncSilenceDialog::OnDurationChange(wxCommandEvent & event) +void TruncSilenceDialog::OnDurationChange(wxCommandEvent & WXUNUSED(event)) { // We may even get called during the constructor. // This test saves us from calling unsafe functions. diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index 290235c0b..5cecd5e98 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -245,7 +245,7 @@ void PluginRegistrationDialog::OnToggleState(wxListEvent & event) // SetBoldOrRegular( i ); } -void PluginRegistrationDialog::OnApply(wxCommandEvent & event) +void PluginRegistrationDialog::OnApply(wxCommandEvent & WXUNUSED(event)) { size_t cnt = mFiles.GetCount(); @@ -270,7 +270,7 @@ void PluginRegistrationDialog::OnApply(wxCommandEvent & event) EndModal( true ); } -void PluginRegistrationDialog::OnCancel(wxCommandEvent &event) +void PluginRegistrationDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) { EndModal(false); } @@ -715,7 +715,7 @@ void VSTEffectDialog::RefreshParameters(int skip) } } -void VSTEffectDialog::OnIdle(wxIdleEvent & evt) +void VSTEffectDialog::OnIdle(wxIdleEvent & WXUNUSED(event)) { if (mGui) { mEffect->callDispatcher(effEditIdle, 0, 0, NULL, 0.0); @@ -738,7 +738,7 @@ void VSTEffectDialog::OnProgram(wxCommandEvent & evt) RefreshParameters(); } -void VSTEffectDialog::OnProgramText(wxCommandEvent & evt) +void VSTEffectDialog::OnProgramText(wxCommandEvent & WXUNUSED(event)) { wxString name = mProgram->GetValue(); int i = mEffect->callDispatcher(effGetProgram, 0, 0, NULL, 0.0); @@ -764,7 +764,7 @@ void VSTEffectDialog::OnProgramText(wxCommandEvent & evt) RefreshParameters(); } -void VSTEffectDialog::OnLoad(wxCommandEvent & evt) +void VSTEffectDialog::OnLoad(wxCommandEvent & WXUNUSED(event)) { wxString fn; @@ -797,7 +797,7 @@ void VSTEffectDialog::OnLoad(wxCommandEvent & evt) return; } -void VSTEffectDialog::OnSave(wxCommandEvent & evt) +void VSTEffectDialog::OnSave(wxCommandEvent & WXUNUSED(event)) { int i = mProgram->GetCurrentSelection(); wxString fn; @@ -869,17 +869,17 @@ void VSTEffectDialog::OnSave(wxCommandEvent & evt) xmlFile.Close(); } -void VSTEffectDialog::OnClose(wxCloseEvent & evt) +void VSTEffectDialog::OnClose(wxCloseEvent & WXUNUSED(event)) { EndModal(false); } -void VSTEffectDialog::OnPreview(wxCommandEvent & evt) +void VSTEffectDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { mEffect->Preview(); } -void VSTEffectDialog::OnOk(wxCommandEvent & evt) +void VSTEffectDialog::OnOk(wxCommandEvent & WXUNUSED(event)) { if (mGui) { mEffect->callDispatcher(effEditClose, 0, 0, NULL, 0.0); @@ -888,7 +888,7 @@ void VSTEffectDialog::OnOk(wxCommandEvent & evt) EndModal(true); } -void VSTEffectDialog::OnCancel(wxCommandEvent & evt) +void VSTEffectDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) { if (mGui) { mEffect->callDispatcher(effEditClose, 0, 0, NULL, 0.0); @@ -1180,7 +1180,7 @@ int VSTEffectDialog::b64decode(wxString in, void *out) } } - const char *a = in.mb_str(); + //const char *a = in.mb_str(); //Setup a vector to hold the result unsigned long temp = 0; //Holds decoded quanta int i = 0; @@ -1564,7 +1564,7 @@ bool VSTEffect::ProcessStereo(int count, sampleCount len) { bool rc = true; - sampleCount amountLeft = 0; + //sampleCount amountLeft = 0; // Initialize time info mTimeInfo.samplePos = 0.0; diff --git a/src/effects/Wahwah.cpp b/src/effects/Wahwah.cpp index 9b86d7935..98365c9f1 100644 --- a/src/effects/Wahwah.cpp +++ b/src/effects/Wahwah.cpp @@ -372,7 +372,7 @@ bool WahwahDialog::TransferDataFromWindow() // WDR: handler implementations for WahwahDialog -void WahwahDialog::OnResonanceSlider(wxCommandEvent & event) +void WahwahDialog::OnResonanceSlider(wxCommandEvent & WXUNUSED(event)) { wxString str; long res = GetResonanceSlider()->GetValue(); @@ -380,7 +380,7 @@ void WahwahDialog::OnResonanceSlider(wxCommandEvent & event) GetResonanceText()->SetValue(str); } -void WahwahDialog::OnDepthSlider(wxCommandEvent & event) +void WahwahDialog::OnDepthSlider(wxCommandEvent & WXUNUSED(event)) { wxString str; long depth = GetDepthSlider()->GetValue(); @@ -388,7 +388,7 @@ void WahwahDialog::OnDepthSlider(wxCommandEvent & event) GetDepthText()->SetValue(str); } -void WahwahDialog::OnPhaseSlider(wxCommandEvent & event) +void WahwahDialog::OnPhaseSlider(wxCommandEvent & WXUNUSED(event)) { wxString str; long phase = GetPhaseSlider()->GetValue(); @@ -397,7 +397,7 @@ void WahwahDialog::OnPhaseSlider(wxCommandEvent & event) GetPhaseText()->SetValue(str); } -void WahwahDialog::OnFreqSlider(wxCommandEvent & event) +void WahwahDialog::OnFreqSlider(wxCommandEvent & WXUNUSED(event)) { wxString str; long freql = GetFreqSlider()->GetValue(); @@ -405,7 +405,7 @@ void WahwahDialog::OnFreqSlider(wxCommandEvent & event) GetFreqText()->SetValue(str); } -void WahwahDialog::OnFreqOffSlider(wxCommandEvent & event) +void WahwahDialog::OnFreqOffSlider(wxCommandEvent & WXUNUSED(event)) { wxString str; long freqoff = GetFreqOffSlider()->GetValue(); @@ -413,7 +413,7 @@ void WahwahDialog::OnFreqOffSlider(wxCommandEvent & event) GetFreqOffText()->SetValue(str); } -void WahwahDialog::OnResonanceText(wxCommandEvent & event) +void WahwahDialog::OnResonanceText(wxCommandEvent & WXUNUSED(event)) { wxTextCtrl *c = GetResonanceText(); if (c) { @@ -429,7 +429,7 @@ void WahwahDialog::OnResonanceText(wxCommandEvent & event) } } -void WahwahDialog::OnDepthText(wxCommandEvent & event) +void WahwahDialog::OnDepthText(wxCommandEvent & WXUNUSED(event)) { wxTextCtrl *c = GetDepthText(); if (c) { @@ -444,7 +444,7 @@ void WahwahDialog::OnDepthText(wxCommandEvent & event) } } -void WahwahDialog::OnPhaseText(wxCommandEvent & event) +void WahwahDialog::OnPhaseText(wxCommandEvent & WXUNUSED(event)) { wxTextCtrl *c = GetPhaseText(); if (c) { @@ -459,7 +459,7 @@ void WahwahDialog::OnPhaseText(wxCommandEvent & event) } } -void WahwahDialog::OnFreqText(wxCommandEvent & event) +void WahwahDialog::OnFreqText(wxCommandEvent & WXUNUSED(event)) { wxTextCtrl *c = GetFreqText(); if (c) { @@ -476,7 +476,7 @@ void WahwahDialog::OnFreqText(wxCommandEvent & event) } } -void WahwahDialog::OnFreqOffText(wxCommandEvent & event) +void WahwahDialog::OnFreqOffText(wxCommandEvent & WXUNUSED(event)) { wxTextCtrl *c = GetFreqOffText(); if (c) { @@ -490,7 +490,7 @@ void WahwahDialog::OnFreqOffText(wxCommandEvent & event) } } -void WahwahDialog::OnPreview(wxCommandEvent &event) +void WahwahDialog::OnPreview(wxCommandEvent & WXUNUSED(event)) { TransferDataFromWindow(); diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index d8f05352e..1fa366125 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -1001,7 +1001,7 @@ int EffectNyquist::StaticGetCallback(float *buffer, int channel, } int EffectNyquist::GetCallback(float *buffer, int ch, - long start, long len, long totlen) + long start, long len, long WXUNUSED(totlen)) { if (mCurBuffer[ch]) { if ((mCurStart[ch] + start) < mCurBufferStart[ch] || diff --git a/src/export/Export.cpp b/src/export/Export.cpp index d4f0c85cd..68a244af5 100644 --- a/src/export/Export.cpp +++ b/src/export/Export.cpp @@ -99,7 +99,7 @@ ExportPlugin::~ExportPlugin() mFormatInfos.Clear(); } -bool ExportPlugin::CheckFileName(wxFileName &filename, int format) +bool ExportPlugin::CheckFileName(wxFileName & WXUNUSED(filename), int WXUNUSED(format)) { return true; } @@ -232,7 +232,7 @@ bool ExportPlugin::IsExtension(wxString & ext, int index) return isext; } -bool ExportPlugin::DisplayOptions(wxWindow *parent, int format) +bool ExportPlugin::DisplayOptions(wxWindow * WXUNUSED(parent), int WXUNUSED(format)) { return false; } @@ -244,7 +244,7 @@ int ExportPlugin::Export(AudacityProject *project, double t0, double t1, MixerSpec *mixerSpec, - Tags *metadata, + Tags * WXUNUSED(metadata), int subformat) { if (project == NULL) { @@ -254,14 +254,14 @@ int ExportPlugin::Export(AudacityProject *project, return DoExport(project, channels, fName, selectedOnly, t0, t1, mixerSpec, subformat); } -int ExportPlugin::DoExport(AudacityProject *project, - int channels, - wxString fName, - bool selectedOnly, - double t0, - double t1, - MixerSpec *mixerSpec, - int subformat) +int ExportPlugin::DoExport(AudacityProject * WXUNUSED(project), + int WXUNUSED(channels), + wxString WXUNUSED(fName), + bool WXUNUSED(selectedOnly), + double WXUNUSED(t0), + double WXUNUSED(t1), + MixerSpec * WXUNUSED(mixerSpec), + int WXUNUSED(subformat)) { return false; } @@ -897,7 +897,7 @@ void ExportMixerPanel::SetFont( wxMemoryDC &memDC, wxString text, int width, memDC.SetFont( font ); } -void ExportMixerPanel::OnPaint(wxPaintEvent & evt) +void ExportMixerPanel::OnPaint(wxPaintEvent & WXUNUSED(event)) { wxPaintDC dc( this ); @@ -1186,7 +1186,7 @@ void ExportMixerDialog::OnSize(wxSizeEvent &event) event.Skip(); } -void ExportMixerDialog::OnSlider( wxCommandEvent &event ) +void ExportMixerDialog::OnSlider( wxCommandEvent & WXUNUSED(event)) { wxSlider *channels = ( wxSlider* )FindWindow( ID_SLIDER_CHANNEL ); ExportMixerPanel *pnl = ( ( ExportMixerPanel* ) FindWindow( ID_MIXERPANEL ) ); @@ -1198,12 +1198,12 @@ void ExportMixerDialog::OnSlider( wxCommandEvent &event ) channels->SetName( label ); } -void ExportMixerDialog::OnOk(wxCommandEvent &event) +void ExportMixerDialog::OnOk(wxCommandEvent & WXUNUSED(event)) { EndModal( wxID_OK ); } -void ExportMixerDialog::OnCancel(wxCommandEvent &event) +void ExportMixerDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) { EndModal( wxID_CANCEL ); } diff --git a/src/export/ExportCL.cpp b/src/export/ExportCL.cpp index df9fdf035..ddf8b38d8 100644 --- a/src/export/ExportCL.cpp +++ b/src/export/ExportCL.cpp @@ -129,7 +129,7 @@ void ExportCLOptions::PopulateOrExchange(ShuttleGui & S) /// /// -void ExportCLOptions::OnOK(wxCommandEvent& event) +void ExportCLOptions::OnOK(wxCommandEvent& WXUNUSED(event)) { ShuttleGui S(this, eIsSavingToPrefs); wxString cmd = mCmd->GetValue(); @@ -149,7 +149,7 @@ void ExportCLOptions::OnOK(wxCommandEvent& event) /// /// -void ExportCLOptions::OnBrowse(wxCommandEvent& event) +void ExportCLOptions::OnBrowse(wxCommandEvent& WXUNUSED(event)) { wxString path; wxString ext; @@ -303,8 +303,8 @@ int ExportCL::Export(AudacityProject *project, double t0, double t1, MixerSpec *mixerSpec, - Tags *metadata, - int subformat) + Tags *WXUNUSED(metadata), + int WXUNUSED(subformat)) { ExportCLProcess *p; wxString output; @@ -513,13 +513,13 @@ int ExportCL::Export(AudacityProject *project, // Clean up delete mixer; - delete[] waveTracks; + delete[] waveTracks; delete p; return updateResult; } -bool ExportCL::DisplayOptions(wxWindow *parent, int format) +bool ExportCL::DisplayOptions(wxWindow *parent, int WXUNUSED(format)) { ExportCLOptions od(parent); diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp index ba2eb9058..d595d63c4 100644 --- a/src/export/ExportFFmpegDialogs.cpp +++ b/src/export/ExportFFmpegDialogs.cpp @@ -194,7 +194,7 @@ void ExportFFmpegAC3Options::PopulateOrExchange(ShuttleGui & S) /// /// -void ExportFFmpegAC3Options::OnOK(wxCommandEvent& event) +void ExportFFmpegAC3Options::OnOK(wxCommandEvent& WXUNUSED(event)) { ShuttleGui S(this, eIsSavingToPrefs); PopulateOrExchange(S); @@ -247,7 +247,7 @@ void ExportFFmpegAACOptions::PopulateOrExchange(ShuttleGui & S) /// /// -void ExportFFmpegAACOptions::OnOK(wxCommandEvent& event) +void ExportFFmpegAACOptions::OnOK(wxCommandEvent& WXUNUSED(event)) { ShuttleGui S(this, eIsSavingToPrefs); PopulateOrExchange(S); @@ -317,7 +317,7 @@ void ExportFFmpegAMRNBOptions::PopulateOrExchange(ShuttleGui & S) /// /// -void ExportFFmpegAMRNBOptions::OnOK(wxCommandEvent& event) +void ExportFFmpegAMRNBOptions::OnOK(wxCommandEvent& WXUNUSED(event)) { ShuttleGui S(this, eIsSavingToPrefs); PopulateOrExchange(S); @@ -389,7 +389,7 @@ void ExportFFmpegWMAOptions::PopulateOrExchange(ShuttleGui & S) /// /// -void ExportFFmpegWMAOptions::OnOK(wxCommandEvent& event) +void ExportFFmpegWMAOptions::OnOK(wxCommandEvent& WXUNUSED(event)) { ShuttleGui S(this, eIsSavingToPrefs); PopulateOrExchange(S); @@ -1650,7 +1650,7 @@ int ExportFFmpegOptions::FetchCompatibleFormatList(CodecID id, wxString *selfmt) /// /// -void ExportFFmpegOptions::OnDeletePreset(wxCommandEvent& event) +void ExportFFmpegOptions::OnDeletePreset(wxCommandEvent& WXUNUSED(event)) { wxComboBox *preset = dynamic_cast(FindWindowById(FEPresetID,this)); wxString presetname = preset->GetValue(); @@ -1673,7 +1673,7 @@ void ExportFFmpegOptions::OnDeletePreset(wxCommandEvent& event) /// /// -void ExportFFmpegOptions::OnSavePreset(wxCommandEvent& event) +void ExportFFmpegOptions::OnSavePreset(wxCommandEvent& WXUNUSED(event)) { wxComboBox *preset = dynamic_cast(FindWindowById(FEPresetID,this)); wxString name = preset->GetValue(); @@ -1695,7 +1695,7 @@ void ExportFFmpegOptions::OnSavePreset(wxCommandEvent& event) /// /// -void ExportFFmpegOptions::OnLoadPreset(wxCommandEvent& event) +void ExportFFmpegOptions::OnLoadPreset(wxCommandEvent& WXUNUSED(event)) { wxComboBox *preset = dynamic_cast(FindWindowById(FEPresetID,this)); wxString presetname = preset->GetValue(); @@ -1715,7 +1715,7 @@ void ExportFFmpegOptions::OnLoadPreset(wxCommandEvent& event) /// /// -void ExportFFmpegOptions::OnImportPresets(wxCommandEvent& event) +void ExportFFmpegOptions::OnImportPresets(wxCommandEvent& WXUNUSED(event)) { wxString path; FileDialog dlg(this, @@ -1735,7 +1735,7 @@ void ExportFFmpegOptions::OnImportPresets(wxCommandEvent& event) /// /// -void ExportFFmpegOptions::OnExportPresets(wxCommandEvent& event) +void ExportFFmpegOptions::OnExportPresets(wxCommandEvent& WXUNUSED(event)) { wxString path; FileDialog dlg(this, @@ -1751,7 +1751,7 @@ void ExportFFmpegOptions::OnExportPresets(wxCommandEvent& event) /// /// -void ExportFFmpegOptions::OnAllFormats(wxCommandEvent& event) +void ExportFFmpegOptions::OnAllFormats(wxCommandEvent& WXUNUSED(event)) { mShownFormatNames = mFormatNames; mShownFormatLongNames = mFormatLongNames; @@ -1761,7 +1761,7 @@ void ExportFFmpegOptions::OnAllFormats(wxCommandEvent& event) /// /// -void ExportFFmpegOptions::OnAllCodecs(wxCommandEvent& event) +void ExportFFmpegOptions::OnAllCodecs(wxCommandEvent& WXUNUSED(event)) { mShownCodecNames = mCodecNames; mShownCodecLongNames = mCodecLongNames; @@ -1880,21 +1880,21 @@ void ExportFFmpegOptions::DoOnCodecList() /// /// -void ExportFFmpegOptions::OnFormatList(wxCommandEvent& event) +void ExportFFmpegOptions::OnFormatList(wxCommandEvent& WXUNUSED(event)) { DoOnFormatList(); } /// /// -void ExportFFmpegOptions::OnCodecList(wxCommandEvent& event) +void ExportFFmpegOptions::OnCodecList(wxCommandEvent& WXUNUSED(event)) { DoOnCodecList(); } /// /// -void ExportFFmpegOptions::OnOK(wxCommandEvent& event) +void ExportFFmpegOptions::OnOK(wxCommandEvent& WXUNUSED(event)) { int selcdc = mCodecList->GetSelection(); int selfmt = mFormatList->GetSelection(); diff --git a/src/export/ExportFLAC.cpp b/src/export/ExportFLAC.cpp index 5dea6727b..782133405 100644 --- a/src/export/ExportFLAC.cpp +++ b/src/export/ExportFLAC.cpp @@ -120,7 +120,7 @@ void ExportFLACOptions::PopulateOrExchange(ShuttleGui & S) /// /// -void ExportFLACOptions::OnOK(wxCommandEvent& event) +void ExportFLACOptions::OnOK(wxCommandEvent& WXUNUSED(event)) { ShuttleGui S(this, eIsSavingToPrefs); PopulateOrExchange(S); @@ -221,7 +221,7 @@ int ExportFLAC::Export(AudacityProject *project, double t1, MixerSpec *mixerSpec, Tags *metadata, - int subformat) + int WXUNUSED(subformat)) { double rate = project->GetRate(); TrackList *tracks = project->GetTracks(); @@ -363,7 +363,7 @@ int ExportFLAC::Export(AudacityProject *project, return updateResult; } -bool ExportFLAC::DisplayOptions(wxWindow *parent, int format) +bool ExportFLAC::DisplayOptions(wxWindow *parent, int WXUNUSED(format)) { ExportFLACOptions od(parent); diff --git a/src/export/ExportMP2.cpp b/src/export/ExportMP2.cpp index ceb9a5cd8..40ea06efc 100644 --- a/src/export/ExportMP2.cpp +++ b/src/export/ExportMP2.cpp @@ -150,7 +150,7 @@ void ExportMP2Options::PopulateOrExchange(ShuttleGui & S) /// /// -void ExportMP2Options::OnOK(wxCommandEvent& event) +void ExportMP2Options::OnOK(wxCommandEvent& WXUNUSED(event)) { ShuttleGui S(this, eIsSavingToPrefs); PopulateOrExchange(S); @@ -212,7 +212,7 @@ void ExportMP2::Destroy() int ExportMP2::Export(AudacityProject *project, int channels, wxString fName, bool selectionOnly, double t0, double t1, MixerSpec *mixerSpec, Tags *metadata, - int subformat) + int WXUNUSED(subformat)) { bool stereo = (channels == 2); long bitrate = gPrefs->Read(wxT("/FileFormats/MP2Bitrate"), 160); @@ -332,7 +332,7 @@ int ExportMP2::Export(AudacityProject *project, return updateResult; } -bool ExportMP2::DisplayOptions(wxWindow *parent, int format) +bool ExportMP2::DisplayOptions(wxWindow *parent, int WXUNUSED(format)) { ExportMP2Options od(parent); @@ -342,7 +342,7 @@ bool ExportMP2::DisplayOptions(wxWindow *parent, int format) } // returns buffer len; caller frees -int ExportMP2::AddTags(AudacityProject *project, char **buffer, bool *endOfFile, Tags *tags) +int ExportMP2::AddTags(AudacityProject * WXUNUSED(project), char **buffer, bool *endOfFile, Tags *tags) { #ifdef USE_LIBID3TAG struct id3_tag *tp = id3_tag_new(); diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp index 9af8dff86..75ef58480 100644 --- a/src/export/ExportMP3.cpp +++ b/src/export/ExportMP3.cpp @@ -436,7 +436,7 @@ void ExportMP3Options::PopulateOrExchange(ShuttleGui & S) /// /// -void ExportMP3Options::OnOK(wxCommandEvent& event) +void ExportMP3Options::OnOK(wxCommandEvent& WXUNUSED(event)) { ShuttleGui S(this, eIsSavingToPrefs); PopulateOrExchange(S); @@ -454,7 +454,7 @@ void ExportMP3Options::OnOK(wxCommandEvent& event) /// /// -void ExportMP3Options::OnSET(wxCommandEvent& evt) +void ExportMP3Options::OnSET(wxCommandEvent& WXUNUSED(event)) { LoadNames(setRates, WXSIZEOF(setRates)); @@ -465,7 +465,7 @@ void ExportMP3Options::OnSET(wxCommandEvent& evt) /// /// -void ExportMP3Options::OnVBR(wxCommandEvent& evt) +void ExportMP3Options::OnVBR(wxCommandEvent& WXUNUSED(event)) { LoadNames(varRates, WXSIZEOF(varRates)); @@ -476,7 +476,7 @@ void ExportMP3Options::OnVBR(wxCommandEvent& evt) /// /// -void ExportMP3Options::OnABR(wxCommandEvent& evt) +void ExportMP3Options::OnABR(wxCommandEvent& WXUNUSED(event)) { LoadNames(fixRates, WXSIZEOF(fixRates)); @@ -487,7 +487,7 @@ void ExportMP3Options::OnABR(wxCommandEvent& evt) /// /// -void ExportMP3Options::OnCBR(wxCommandEvent& evt) +void ExportMP3Options::OnCBR(wxCommandEvent& WXUNUSED(event)) { LoadNames(fixRates, WXSIZEOF(fixRates)); @@ -496,7 +496,7 @@ void ExportMP3Options::OnCBR(wxCommandEvent& evt) mMode->Enable(false); } -void ExportMP3Options::OnQuality(wxCommandEvent& evt) +void ExportMP3Options::OnQuality(wxCommandEvent& WXUNUSED(event)) { int sel = mRate->GetSelection(); @@ -635,7 +635,7 @@ public: return; } - void OnBrowse(wxCommandEvent & event) + void OnBrowse(wxCommandEvent & WXUNUSED(event)) { wxString question; /* i18n-hint: It's asking for the location of a file, for @@ -656,7 +656,7 @@ public: } } - void OnDownload(wxCommandEvent & event) + void OnDownload(wxCommandEvent & WXUNUSED(event)) { wxString page = wxT("http://manual.audacityteam.org/o/man/faq_installation_and_plug_ins.html#lame"); ::OpenInDefaultBrowser(page); @@ -1614,7 +1614,7 @@ int ExportMP3::Export(AudacityProject *project, double t1, MixerSpec *mixerSpec, Tags *metadata, - int subformat) + int WXUNUSED(subformat)) { int rate = lrint(project->GetRate()); #ifndef DISABLE_DYNAMIC_LOADING_LAME @@ -1856,7 +1856,7 @@ int ExportMP3::Export(AudacityProject *project, return updateResult; } -bool ExportMP3::DisplayOptions(wxWindow *parent, int format) +bool ExportMP3::DisplayOptions(wxWindow *parent, int WXUNUSED(format)) { ExportMP3Options od(parent); @@ -1956,7 +1956,7 @@ int ExportMP3::AskResample(int bitrate, int rate, int lowrate, int highrate) } // returns buffer len; caller frees -int ExportMP3::AddTags(AudacityProject *project, char **buffer, bool *endOfFile, Tags *tags) +int ExportMP3::AddTags(AudacityProject *WXUNUSED(project), char **buffer, bool *endOfFile, Tags *tags) { #ifdef USE_LIBID3TAG struct id3_tag *tp = id3_tag_new(); diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp index 0e7c5e9d2..8a588097e 100644 --- a/src/export/ExportMultiple.cpp +++ b/src/export/ExportMultiple.cpp @@ -391,12 +391,12 @@ void ExportMultiple::EnableControls() mExport->Enable(ok); } -void ExportMultiple::OnFormat(wxCommandEvent& event) +void ExportMultiple::OnFormat(wxCommandEvent& WXUNUSED(event)) { EnableControls(); } -void ExportMultiple::OnOptions(wxCommandEvent& event) +void ExportMultiple::OnOptions(wxCommandEvent& WXUNUSED(event)) { const int sel = mFormat->GetSelection(); if (sel != wxNOT_FOUND) @@ -418,7 +418,7 @@ void ExportMultiple::OnOptions(wxCommandEvent& event) mPlugins[mPluginIndex]->DisplayOptions(this,mSubFormatIndex); } -void ExportMultiple::OnCreate(wxCommandEvent& event) +void ExportMultiple::OnCreate(wxCommandEvent& WXUNUSED(event)) { wxFileName fn; @@ -437,7 +437,7 @@ void ExportMultiple::OnCreate(wxCommandEvent& event) wxOK | wxCENTRE, this); } -void ExportMultiple::OnChoose(wxCommandEvent& event) +void ExportMultiple::OnChoose(wxCommandEvent& WXUNUSED(event)) { wxDirDialog dlog(this, _("Choose a location to save the exported files"), @@ -447,47 +447,47 @@ void ExportMultiple::OnChoose(wxCommandEvent& event) mDir->SetValue(dlog.GetPath()); } -void ExportMultiple::OnLabel(wxCommandEvent& event) +void ExportMultiple::OnLabel(wxCommandEvent& WXUNUSED(event)) { EnableControls(); } -void ExportMultiple::OnFirst(wxCommandEvent& event) +void ExportMultiple::OnFirst(wxCommandEvent& WXUNUSED(event)) { EnableControls(); } -void ExportMultiple::OnFirstFileName(wxCommandEvent& event) +void ExportMultiple::OnFirstFileName(wxCommandEvent& WXUNUSED(event)) { EnableControls(); } -void ExportMultiple::OnTrack(wxCommandEvent& event) +void ExportMultiple::OnTrack(wxCommandEvent& WXUNUSED(event)) { EnableControls(); } -void ExportMultiple::OnByName(wxCommandEvent& event) +void ExportMultiple::OnByName(wxCommandEvent& WXUNUSED(event)) { EnableControls(); } -void ExportMultiple::OnByNumber(wxCommandEvent& event) +void ExportMultiple::OnByNumber(wxCommandEvent& WXUNUSED(event)) { EnableControls(); } -void ExportMultiple::OnPrefix(wxCommandEvent& event) +void ExportMultiple::OnPrefix(wxCommandEvent& WXUNUSED(event)) { EnableControls(); } -void ExportMultiple::OnCancel(wxCommandEvent& event) +void ExportMultiple::OnCancel(wxCommandEvent& WXUNUSED(event)) { EndModal(0); } -void ExportMultiple::OnExport(wxCommandEvent& event) +void ExportMultiple::OnExport(wxCommandEvent& WXUNUSED(event)) { ShuttleGui S(this, eIsSavingToPrefs); PopulateOrExchange(S); @@ -954,7 +954,7 @@ void SuccessDialog::OnKeyDown(wxListEvent& event) event.Skip(); // allow standard behaviour } -void SuccessDialog::OnItemActivated(wxListEvent& event) +void SuccessDialog::OnItemActivated(wxListEvent& WXUNUSED(event)) { EndModal(1); } diff --git a/src/export/ExportOGG.cpp b/src/export/ExportOGG.cpp index ee820f3f2..a39e81cf0 100644 --- a/src/export/ExportOGG.cpp +++ b/src/export/ExportOGG.cpp @@ -60,7 +60,7 @@ END_EVENT_TABLE() /// /// -ExportOGGOptions::ExportOGGOptions(wxWindow *parent, int format) +ExportOGGOptions::ExportOGGOptions(wxWindow *parent, int WXUNUSED(format)) : wxDialog(parent, wxID_ANY, wxString(_("Specify Ogg Vorbis Options"))) { @@ -102,7 +102,7 @@ void ExportOGGOptions::PopulateOrExchange(ShuttleGui & S) /// /// -void ExportOGGOptions::OnOK(wxCommandEvent& event) +void ExportOGGOptions::OnOK(wxCommandEvent& WXUNUSED(event)) { ShuttleGui S(this, eIsSavingToPrefs); PopulateOrExchange(S); @@ -170,7 +170,7 @@ int ExportOGG::Export(AudacityProject *project, double t1, MixerSpec *mixerSpec, Tags *metadata, - int subformat) + int WXUNUSED(subformat)) { double rate = project->GetRate(); TrackList *tracks = project->GetTracks(); diff --git a/src/import/ImportFFmpeg.cpp b/src/import/ImportFFmpeg.cpp index 7d63696aa..0af8a6968 100644 --- a/src/import/ImportFFmpeg.cpp +++ b/src/import/ImportFFmpeg.cpp @@ -279,7 +279,7 @@ private: void GetFFmpegImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList) + UnusableImportPluginList *WXUNUSED(unusableImportPluginList)) { importPluginList->Append(new FFmpegImportPlugin); } diff --git a/src/import/ImportFLAC.cpp b/src/import/ImportFLAC.cpp index 55d471a74..b021daa61 100644 --- a/src/import/ImportFLAC.cpp +++ b/src/import/ImportFLAC.cpp @@ -160,7 +160,7 @@ public: wxArrayString *GetStreamInfo(){ return NULL; } - void SetStreamUsage(wxInt32 StreamID, bool Use){} + void SetStreamUsage(wxInt32 WXUNUSED(StreamID), bool WXUNUSED(Use)){} private: sampleFormat mFormat; @@ -218,7 +218,7 @@ void MyFLACFile::metadata_callback(const FLAC__StreamMetadata *metadata) } } -void MyFLACFile::error_callback(FLAC__StreamDecoderErrorStatus status) +void MyFLACFile::error_callback(FLAC__StreamDecoderErrorStatus WXUNUSED(status)) { mWasError = true; @@ -277,7 +277,7 @@ FLAC__StreamDecoderWriteStatus MyFLACFile::write_callback(const FLAC__Frame *fra void GetFLACImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList) + UnusableImportPluginList *WXUNUSED(unusableImportPluginList)) { importPluginList->Append(new FLACImportPlugin); } diff --git a/src/import/ImportLOF.cpp b/src/import/ImportLOF.cpp index a5d11c472..3616d538a 100644 --- a/src/import/ImportLOF.cpp +++ b/src/import/ImportLOF.cpp @@ -133,7 +133,7 @@ public: wxArrayString *GetStreamInfo(){ return NULL; } - void SetStreamUsage(wxInt32 StreamID, bool Use){} + void SetStreamUsage(wxInt32 WXUNUSED(StreamID), bool WXUNUSED(Use)){} private: // Takes a line of text in lof file and interprets it and opens files @@ -172,7 +172,7 @@ LOFImportFileHandle::LOFImportFileHandle(const wxString & name, wxTextFile *file } void GetLOFImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList) + UnusableImportPluginList * WXUNUSED(unusableImportPluginList)) { importPluginList->Append(new LOFImportPlugin); } @@ -230,8 +230,8 @@ int LOFImportFileHandle::GetFileUncompressedBytes() return 0; } -int LOFImportFileHandle::Import(TrackFactory *trackFactory, Track ***outTracks, - int *outNumTracks, Tags *tags) +int LOFImportFileHandle::Import(TrackFactory * WXUNUSED(trackFactory), Track *** WXUNUSED(outTracks), + int * WXUNUSED(outNumTracks), Tags * WXUNUSED(tags)) { wxASSERT(mTextFile->IsOpened()); diff --git a/src/import/ImportMP3.cpp b/src/import/ImportMP3.cpp index 05aaa281b..24f2cf1f4 100644 --- a/src/import/ImportMP3.cpp +++ b/src/import/ImportMP3.cpp @@ -137,7 +137,7 @@ public: wxArrayString *GetStreamInfo(){ return NULL; } - void SetStreamUsage(wxInt32 StreamID, bool Use){} + void SetStreamUsage(wxInt32 WXUNUSED(StreamID), bool WXUNUSED(Use)){} private: void ImportID3(Tags *tags); @@ -149,7 +149,7 @@ private: }; void GetMP3ImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList) + UnusableImportPluginList * WXUNUSED(unusableImportPluginList)) { importPluginList->Append(new MP3ImportPlugin); } @@ -466,7 +466,7 @@ enum mad_flow input_cb(void *_data, struct mad_stream *stream) * a frame, allowing us to use the decoded data */ enum mad_flow output_cb(void *_data, - struct mad_header const *header, + struct mad_header const * WXUNUSED(header), struct mad_pcm *pcm) { int channels, samplerate; @@ -532,8 +532,8 @@ enum mad_flow output_cb(void *_data, return MAD_FLOW_CONTINUE; } -enum mad_flow error_cb(void *_data, struct mad_stream *stream, - struct mad_frame *frame) +enum mad_flow error_cb(void * WXUNUSED(_data), struct mad_stream * WXUNUSED(stream), + struct mad_frame * WXUNUSED(frame)) { /* enum mad_flow { MAD_FLOW_CONTINUE = 0x0000, diff --git a/src/import/ImportOGG.cpp b/src/import/ImportOGG.cpp index 6bdbdbe7f..45e047dc1 100644 --- a/src/import/ImportOGG.cpp +++ b/src/import/ImportOGG.cpp @@ -153,7 +153,7 @@ private: }; void GetOGGImportPlugin(ImportPluginList *importPluginList, - UnusableImportPluginList *unusableImportPluginList) + UnusableImportPluginList * WXUNUSED(unusableImportPluginList)) { importPluginList->Append(new OggImportPlugin); } diff --git a/src/import/ImportPCM.cpp b/src/import/ImportPCM.cpp index 07bfb48d8..89050b314 100644 --- a/src/import/ImportPCM.cpp +++ b/src/import/ImportPCM.cpp @@ -99,7 +99,7 @@ public: wxArrayString *GetStreamInfo(){ return NULL; } - void SetStreamUsage(wxInt32 StreamID, bool Use){} + void SetStreamUsage(wxInt32 WXUNUSED(StreamID), bool WXUNUSED(Use)){} private: SNDFILE *mFile; diff --git a/src/import/RawAudioGuess.cpp b/src/import/RawAudioGuess.cpp index 8712d2615..fcb4effc1 100644 --- a/src/import/RawAudioGuess.cpp +++ b/src/import/RawAudioGuess.cpp @@ -139,6 +139,7 @@ static void ExtractFloats(bool doublePrec, double d; } u; + u.d = 0.0f; while (rawCount + 7 < dataSize) { if (swap) for(i=0; i<8; i++) @@ -157,6 +158,7 @@ static void ExtractFloats(bool doublePrec, float f; } u; + u.f = 0.0f; while (rawCount + 3 < dataSize) { if (swap) for(i=0; i<4; i++) diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp index b18d806ca..a35f471b8 100644 --- a/src/prefs/DevicePrefs.cpp +++ b/src/prefs/DevicePrefs.cpp @@ -270,7 +270,7 @@ void DevicePrefs::OnHost(wxCommandEvent & e) OnDevice(e); } -void DevicePrefs::OnDevice(wxCommandEvent & e) +void DevicePrefs::OnDevice(wxCommandEvent & WXUNUSED(event)) { int ndx = mRecord->GetCurrentSelection(); if (ndx == wxNOT_FOUND) { diff --git a/src/prefs/DirectoriesPrefs.cpp b/src/prefs/DirectoriesPrefs.cpp index 3af9914ef..ad8d80dd9 100644 --- a/src/prefs/DirectoriesPrefs.cpp +++ b/src/prefs/DirectoriesPrefs.cpp @@ -162,7 +162,7 @@ void DirectoriesPrefs::OnChooseTempDir(wxCommandEvent & e) } } -void DirectoriesPrefs::UpdateFreeSpace(wxCommandEvent & e) +void DirectoriesPrefs::UpdateFreeSpace(wxCommandEvent & WXUNUSED(event)) { wxString tempDir; wxString label; diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp index 5c258d9db..79d948bd2 100644 --- a/src/prefs/ExtImportPrefs.cpp +++ b/src/prefs/ExtImportPrefs.cpp @@ -309,7 +309,7 @@ void ExtImportPrefs::SwapRows (int row1, int row2) } } -void ExtImportPrefs::OnPluginBeginDrag(wxListEvent& event) +void ExtImportPrefs::OnPluginBeginDrag(wxListEvent& WXUNUSED(event)) { wxDropSource dragSource(this); dragtext2->SetText(wxT("")); @@ -552,7 +552,7 @@ void ExtImportPrefs::AddItemToTable (int index, ExtImportItem *item) RuleTable->AutoSizeColumns (); } -void ExtImportPrefs::OnAddRule(wxCommandEvent& event) +void ExtImportPrefs::OnAddRule(wxCommandEvent& WXUNUSED(event)) { ExtImportItems *items = wxGetApp().mImporter->GetImportItems(); ExtImportItem *item = wxGetApp().mImporter->CreateDefaultImportItem(); @@ -564,7 +564,7 @@ void ExtImportPrefs::OnAddRule(wxCommandEvent& event) RuleTable->SetFocus(); } -void ExtImportPrefs::OnDelRule(wxCommandEvent& event) +void ExtImportPrefs::OnDelRule(wxCommandEvent& WXUNUSED(event)) { if (last_selected < 0) return; @@ -587,12 +587,12 @@ void ExtImportPrefs::OnDelRule(wxCommandEvent& event) } } -void ExtImportPrefs::OnRuleMoveUp(wxCommandEvent& event) +void ExtImportPrefs::OnRuleMoveUp(wxCommandEvent& WXUNUSED(event)) { DoOnRuleTableKeyDown (WXK_UP); } -void ExtImportPrefs::OnRuleMoveDown(wxCommandEvent& event) +void ExtImportPrefs::OnRuleMoveDown(wxCommandEvent& WXUNUSED(event)) { DoOnRuleTableKeyDown (WXK_DOWN); } @@ -607,12 +607,12 @@ void ExtImportPrefs::FakeOnPluginKeyDown (int keycode) mFakeKeyEvent = false; } -void ExtImportPrefs::OnFilterMoveUp(wxCommandEvent& event) +void ExtImportPrefs::OnFilterMoveUp(wxCommandEvent& WXUNUSED(event)) { FakeOnPluginKeyDown (WXK_UP); } -void ExtImportPrefs::OnFilterMoveDown(wxCommandEvent& event) +void ExtImportPrefs::OnFilterMoveDown(wxCommandEvent& WXUNUSED(event)) { FakeOnPluginKeyDown (WXK_DOWN); } @@ -658,7 +658,7 @@ void ExtImportPrefsDropTarget::SetPrefs (ExtImportPrefs *prefs) mPrefs = prefs; } -wxDragResult ExtImportPrefsDropTarget::OnData(wxCoord x, wxCoord y, +wxDragResult ExtImportPrefsDropTarget::OnData(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def) { return def; @@ -721,7 +721,7 @@ wxDragResult ExtImportPrefsDropTarget::OnEnter(wxCoord x, wxCoord y, } wxDragResult ExtImportPrefsDropTarget::OnDragOver(wxCoord x, wxCoord y, - wxDragResult def) + wxDragResult WXUNUSED(def)) { if (mPrefs == NULL) return wxDragNone; diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp index f2df10a99..f05e9cdd8 100644 --- a/src/prefs/KeyConfigPrefs.cpp +++ b/src/prefs/KeyConfigPrefs.cpp @@ -275,7 +275,7 @@ void KeyConfigPrefs::RepopulateBindingsList() // mList->SortItems(SortCallback, (long) &mNames); } -void KeyConfigPrefs::OnImport(wxCommandEvent & e) +void KeyConfigPrefs::OnImport(wxCommandEvent & WXUNUSED(event)) { wxString file = wxT("Audacity-keys.xml"); wxString path = gPrefs->Read(wxT("/DefaultOpenPath"), @@ -307,7 +307,7 @@ void KeyConfigPrefs::OnImport(wxCommandEvent & e) RepopulateBindingsList(); } -void KeyConfigPrefs::OnExport(wxCommandEvent & e) +void KeyConfigPrefs::OnExport(wxCommandEvent & WXUNUSED(event)) { wxString file = wxT("Audacity-keys.xml"); wxString path = gPrefs->Read(wxT("/DefaultExportPath"), @@ -347,7 +347,7 @@ void KeyConfigPrefs::OnExport(wxCommandEvent & e) } } -void KeyConfigPrefs::OnDefaults(wxCommandEvent & e) +void KeyConfigPrefs::OnDefaults(wxCommandEvent & WXUNUSED(event)) { for (size_t i = 0; i < mNames.GetCount(); i++) { mManager->SetKeyFromIndex(i,mDefaultKeys[i]); @@ -376,7 +376,7 @@ void KeyConfigPrefs::OnCaptureKeyDown(wxKeyEvent & e) t->SetValue(KeyStringDisplay(KeyEventToKeyString(e))); } -void KeyConfigPrefs::OnCaptureChar(wxKeyEvent & e) +void KeyConfigPrefs::OnCaptureChar(wxKeyEvent & WXUNUSED(event)) { } @@ -412,7 +412,7 @@ void KeyConfigPrefs::SetKeyForSelected( const wxString & key ) } -void KeyConfigPrefs::OnSet(wxCommandEvent & e) +void KeyConfigPrefs::OnSet(wxCommandEvent & WXUNUSED(event)) { if ( mCommandSelected >= (int)mNames.GetCount()) return; @@ -434,7 +434,7 @@ void KeyConfigPrefs::OnSet(wxCommandEvent & e) SetKeyForSelected( newKey ); } -void KeyConfigPrefs::OnClear(wxCommandEvent& event) +void KeyConfigPrefs::OnClear(wxCommandEvent& WXUNUSED(event)) { mKey->Clear(); @@ -444,7 +444,7 @@ void KeyConfigPrefs::OnClear(wxCommandEvent& event) SetKeyForSelected( wxT("") ); } -void KeyConfigPrefs::OnKeyDown(wxListEvent & e) +void KeyConfigPrefs::OnKeyDown(wxListEvent & WXUNUSED(event)) { // the code in this function allows the user to seek to the next // command which begins with the letter that is pressed @@ -458,8 +458,8 @@ void KeyConfigPrefs::OnKeyDown(wxListEvent & e) // Windows seems to have this built-in // and does not need the following code return; -#endif +#else // The following code seems to work well on at least some versions of Linux int keycode = e.GetKeyCode(); int selected = mList->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); @@ -514,9 +514,10 @@ void KeyConfigPrefs::OnKeyDown(wxListEvent & e) } } } +#endif } -void KeyConfigPrefs::OnCategory(wxCommandEvent & e) +void KeyConfigPrefs::OnCategory(wxCommandEvent & WXUNUSED(event)) { RepopulateBindingsList(); } diff --git a/src/prefs/LibraryPrefs.cpp b/src/prefs/LibraryPrefs.cpp index 949df7db1..faa269d16 100644 --- a/src/prefs/LibraryPrefs.cpp +++ b/src/prefs/LibraryPrefs.cpp @@ -161,14 +161,14 @@ void LibraryPrefs::SetMP3VersionText(bool prompt) /// Opens a file-finder dialog so that the user can /// tell us where the MP3 library is. -void LibraryPrefs::OnMP3FindButton(wxCommandEvent & e) +void LibraryPrefs::OnMP3FindButton(wxCommandEvent & WXUNUSED(event)) { SetMP3VersionText(true); } /// Opens a file-finder dialog so that the user can /// tell us where the MP3 library is. -void LibraryPrefs::OnMP3DownButton(wxCommandEvent & e) +void LibraryPrefs::OnMP3DownButton(wxCommandEvent & WXUNUSED(event)) { wxString url = wxT("http://manual.audacityteam.org/o/man/faq_installation_and_plug_ins.html#lame"); ::OpenInDefaultBrowser(url); @@ -180,7 +180,7 @@ void LibraryPrefs::SetFFmpegVersionText() mFFmpegVersion->SetName(mFFmpegVersion->GetLabel()); // fix for bug 577 (NVDA/Narrator screen readers do not read static text in dialogs) } -void LibraryPrefs::OnFFmpegFindButton(wxCommandEvent & e) +void LibraryPrefs::OnFFmpegFindButton(wxCommandEvent & WXUNUSED(event)) { #ifdef USE_FFMPEG FFmpegLibs* FFmpegLibsInst = PickFFmpegLibs(); @@ -217,7 +217,7 @@ void LibraryPrefs::OnFFmpegFindButton(wxCommandEvent & e) #endif } -void LibraryPrefs::OnFFmpegDownButton(wxCommandEvent & e) +void LibraryPrefs::OnFFmpegDownButton(wxCommandEvent & WXUNUSED(event)) { wxString url = wxT("http://manual.audacityteam.org/o/man/faq_installation_and_plug_ins.html#ffdown"); ::OpenInDefaultBrowser(url); diff --git a/src/prefs/ThemePrefs.cpp b/src/prefs/ThemePrefs.cpp index 7a6a74749..55a1b5998 100644 --- a/src/prefs/ThemePrefs.cpp +++ b/src/prefs/ThemePrefs.cpp @@ -156,20 +156,20 @@ void ThemePrefs::PopulateOrExchange(ShuttleGui & S) } /// Load Theme from multiple png files. -void ThemePrefs::OnLoadThemeComponents(wxCommandEvent & e) +void ThemePrefs::OnLoadThemeComponents(wxCommandEvent & WXUNUSED(event)) { theTheme.LoadComponents(); theTheme.ApplyUpdatedImages(); } /// Save Theme to multiple png files. -void ThemePrefs::OnSaveThemeComponents(wxCommandEvent & e) +void ThemePrefs::OnSaveThemeComponents(wxCommandEvent & WXUNUSED(event)) { theTheme.SaveComponents(); } /// Load Theme from single png file. -void ThemePrefs::OnLoadThemeCache(wxCommandEvent & e) +void ThemePrefs::OnLoadThemeCache(wxCommandEvent & WXUNUSED(event)) { theTheme.ReadImageCache(); AColor::ReInit(); @@ -177,21 +177,21 @@ void ThemePrefs::OnLoadThemeCache(wxCommandEvent & e) } /// Save Theme to single png file. -void ThemePrefs::OnSaveThemeCache(wxCommandEvent & e) +void ThemePrefs::OnSaveThemeCache(wxCommandEvent & WXUNUSED(event)) { theTheme.CreateImageCache(); theTheme.WriteImageMap();// bonus - give them the html version. } /// Read Theme from internal storage. -void ThemePrefs::OnReadThemeInternal(wxCommandEvent & e) +void ThemePrefs::OnReadThemeInternal(wxCommandEvent & WXUNUSED(event)) { theTheme.ReadThemeInternal(); theTheme.ApplyUpdatedImages(); } /// Save Theme as C source code. -void ThemePrefs::OnSaveThemeAsCode(wxCommandEvent & e) +void ThemePrefs::OnSaveThemeAsCode(wxCommandEvent & WXUNUSED(event)) { theTheme.SaveThemeAsCode(); theTheme.WriteImageDefs();// bonus - give them the Defs too. diff --git a/src/toolbars/MeterToolBar.cpp b/src/toolbars/MeterToolBar.cpp index cf9942f1c..e7703273e 100644 --- a/src/toolbars/MeterToolBar.cpp +++ b/src/toolbars/MeterToolBar.cpp @@ -139,7 +139,7 @@ bool MeterToolBar::DestroyChildren() return ToolBar::DestroyChildren(); } -void MeterToolBar::OnSize( wxSizeEvent & evt ) +void MeterToolBar::OnSize( wxSizeEvent & WXUNUSED(event) ) { int width, height; diff --git a/src/toolbars/MixerToolBar.cpp b/src/toolbars/MixerToolBar.cpp index cc0c28f66..2da53a91f 100644 --- a/src/toolbars/MixerToolBar.cpp +++ b/src/toolbars/MixerToolBar.cpp @@ -228,7 +228,7 @@ void MixerToolBar::UpdateControls() #endif // USE_PORTMIXER } -void MixerToolBar::SetMixer(wxCommandEvent &event) +void MixerToolBar::SetMixer(wxCommandEvent & WXUNUSED(event)) { #if USE_PORTMIXER float inputVolume = mInputSlider->Get(); diff --git a/src/toolbars/SelectionBar.cpp b/src/toolbars/SelectionBar.cpp index fc4bac153..564424762 100644 --- a/src/toolbars/SelectionBar.cpp +++ b/src/toolbars/SelectionBar.cpp @@ -324,17 +324,17 @@ void SelectionBar::ModifySelection() mListener->AS_ModifySelection(mStart, mEnd); } -void SelectionBar::OnLeftTime(wxCommandEvent &evt) +void SelectionBar::OnLeftTime(wxCommandEvent & WXUNUSED(event)) { ModifySelection(); } -void SelectionBar::OnRightTime(wxCommandEvent &evt) +void SelectionBar::OnRightTime(wxCommandEvent & WXUNUSED(event)) { ModifySelection(); } -void SelectionBar::OnLengthRadio(wxCommandEvent &evt) +void SelectionBar::OnLengthRadio(wxCommandEvent & WXUNUSED(event)) { gPrefs->Write(wxT("/ShowSelectionLength"), true); gPrefs->Flush(); @@ -343,7 +343,7 @@ void SelectionBar::OnLengthRadio(wxCommandEvent &evt) ValuesToControls(); } -void SelectionBar::OnEndRadio(wxCommandEvent &evt) +void SelectionBar::OnEndRadio(wxCommandEvent & WXUNUSED(event)) { gPrefs->Write(wxT("/ShowSelectionLength"), false); mRightTime->SetName(wxString(_("Selection End"))); @@ -483,7 +483,7 @@ void SelectionBar::SetRate(double rate) } } -void SelectionBar::OnRate(wxCommandEvent &evt) +void SelectionBar::OnRate(wxCommandEvent & WXUNUSED(event)) { if (mRateBox->GetValue().ToDouble(&mRate) && // is a numeric value (mRate != 0.0)) @@ -559,7 +559,7 @@ void SelectionBar::OnCaptureKey(wxCommandEvent &event) return; } -void SelectionBar::OnSnapTo(wxCommandEvent & event) +void SelectionBar::OnSnapTo(wxCommandEvent & WXUNUSED(event)) { mListener->AS_SetSnapTo(mSnapTo->GetValue()); diff --git a/src/toolbars/ToolBar.cpp b/src/toolbars/ToolBar.cpp index ef8310a65..70a92f6e0 100644 --- a/src/toolbars/ToolBar.cpp +++ b/src/toolbars/ToolBar.cpp @@ -522,7 +522,7 @@ void ToolBar::SetButton( bool down, AButton * button ) // // Handle background erasure // -void ToolBar::OnErase( wxEraseEvent & event ) +void ToolBar::OnErase( wxEraseEvent & WXUNUSED(event) ) { // Ignore it to prevent flashing } @@ -724,7 +724,7 @@ void ToolBar::OnMotion( wxMouseEvent & event ) } } -void ToolBar::OnCaptureLost( wxMouseCaptureLostEvent & event ) +void ToolBar::OnCaptureLost( wxMouseCaptureLostEvent & WXUNUSED(event) ) { if( HasCapture() ) { diff --git a/src/toolbars/ToolDock.cpp b/src/toolbars/ToolDock.cpp index ff0c04aa5..c3f18772a 100644 --- a/src/toolbars/ToolDock.cpp +++ b/src/toolbars/ToolDock.cpp @@ -492,7 +492,7 @@ void ToolDock::OnGrabber( GrabberEvent & event ) // // Handle sizing // -void ToolDock::OnSize( wxSizeEvent & event ) +void ToolDock::OnSize( wxSizeEvent & WXUNUSED(event) ) { // event.Skip(); } @@ -500,7 +500,7 @@ void ToolDock::OnSize( wxSizeEvent & event ) // // Prevent flicker // -void ToolDock::OnErase( wxEraseEvent & event ) +void ToolDock::OnErase( wxEraseEvent & WXUNUSED(event) ) { // Ignore it to prevent flashing } @@ -508,7 +508,7 @@ void ToolDock::OnErase( wxEraseEvent & event ) // // Repaint toolbar gap lines // -void ToolDock::OnPaint( wxPaintEvent & event ) +void ToolDock::OnPaint( wxPaintEvent & WXUNUSED(event) ) { // Don't use a wxBufferedPaintDC() here. It produces a bogus // background on Windows and GTK. diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp index 35e49a8fe..df0362c44 100644 --- a/src/toolbars/ToolManager.cpp +++ b/src/toolbars/ToolManager.cpp @@ -174,7 +174,7 @@ class ToolFrame:public wxFrame // // Handle frame paint events // - void OnPaint( wxPaintEvent & event ) + void OnPaint( wxPaintEvent & WXUNUSED(event) ) { wxPaintDC dc( this ); wxSize sz = GetSize(); @@ -264,7 +264,7 @@ class ToolFrame:public wxFrame } } - void OnCaptureLost( wxMouseCaptureLostEvent & event ) + void OnCaptureLost( wxMouseCaptureLostEvent & WXUNUSED(event) ) { if( HasCapture() ) { @@ -824,6 +824,7 @@ bool ToolManager::IsVisible( int type ) return t->IsVisible(); +#if 0 // If toolbar is floating if( !t->IsDocked() ) { @@ -833,6 +834,7 @@ bool ToolManager::IsVisible( int type ) // Return state of docked toolbar return t->IsShown(); +#endif } // diff --git a/src/toolbars/TranscriptionToolBar.cpp b/src/toolbars/TranscriptionToolBar.cpp index 16feac77d..f7fbedb2b 100644 --- a/src/toolbars/TranscriptionToolBar.cpp +++ b/src/toolbars/TranscriptionToolBar.cpp @@ -385,7 +385,7 @@ void TranscriptionToolBar::GetSamples(WaveTrack *t, sampleCount *s0, sampleCount *slen = ss1 - ss0; } -void TranscriptionToolBar::OnPlaySpeed(wxCommandEvent & event) +void TranscriptionToolBar::OnPlaySpeed(wxCommandEvent & WXUNUSED(event)) { // Can't do anything without an active project AudacityProject * p = GetActiveProject(); @@ -432,7 +432,7 @@ void TranscriptionToolBar::OnPlaySpeed(wxCommandEvent & event) } } -void TranscriptionToolBar::OnSpeedSlider(wxCommandEvent& event) +void TranscriptionToolBar::OnSpeedSlider(wxCommandEvent& WXUNUSED(event)) { mPlaySpeed = (mPlaySpeedSlider->Get()) * 100; @@ -444,7 +444,7 @@ void TranscriptionToolBar::OnSpeedSlider(wxCommandEvent& event) //} } -void TranscriptionToolBar::OnStartOn(wxCommandEvent &event) +void TranscriptionToolBar::OnStartOn(wxCommandEvent & WXUNUSED(event)) { //If IO is busy, abort immediately if (gAudioIO->IsBusy()){ @@ -477,7 +477,7 @@ void TranscriptionToolBar::OnStartOn(wxCommandEvent &event) } } -void TranscriptionToolBar::OnStartOff(wxCommandEvent &event) +void TranscriptionToolBar::OnStartOff(wxCommandEvent & WXUNUSED(event)) { //If IO is busy, abort immediately if (gAudioIO->IsBusy()){ @@ -510,7 +510,7 @@ void TranscriptionToolBar::OnStartOff(wxCommandEvent &event) } } -void TranscriptionToolBar::OnEndOn(wxCommandEvent &event) +void TranscriptionToolBar::OnEndOn(wxCommandEvent & WXUNUSED(event)) { //If IO is busy, abort immediately @@ -547,7 +547,7 @@ void TranscriptionToolBar::OnEndOn(wxCommandEvent &event) -void TranscriptionToolBar::OnEndOff(wxCommandEvent &event) +void TranscriptionToolBar::OnEndOff(wxCommandEvent & WXUNUSED(event)) { //If IO is busy, abort immediately @@ -582,7 +582,7 @@ void TranscriptionToolBar::OnEndOff(wxCommandEvent &event) -void TranscriptionToolBar::OnSelectSound(wxCommandEvent &event) +void TranscriptionToolBar::OnSelectSound(wxCommandEvent & WXUNUSED(event)) { //If IO is busy, abort immediately @@ -623,7 +623,7 @@ void TranscriptionToolBar::OnSelectSound(wxCommandEvent &event) SetButton(false,mButtons[TTB_SelectSound]); } -void TranscriptionToolBar::OnSelectSilence(wxCommandEvent &event) +void TranscriptionToolBar::OnSelectSilence(wxCommandEvent & WXUNUSED(event)) { //If IO is busy, abort immediately @@ -665,7 +665,7 @@ void TranscriptionToolBar::OnSelectSilence(wxCommandEvent &event) -void TranscriptionToolBar::OnCalibrate(wxCommandEvent &event) +void TranscriptionToolBar::OnCalibrate(wxCommandEvent & WXUNUSED(event)) { //If IO is busy, abort immediately if (gAudioIO->IsBusy()){ @@ -714,7 +714,7 @@ void TranscriptionToolBar::OnCalibrate(wxCommandEvent &event) //This automates selection through a selected region, //selecting its best guess for words and creating labels at those points. -void TranscriptionToolBar::OnAutomateSelection(wxCommandEvent &event) +void TranscriptionToolBar::OnAutomateSelection(wxCommandEvent & WXUNUSED(event)) { @@ -802,7 +802,7 @@ void TranscriptionToolBar::OnAutomateSelection(wxCommandEvent &event) } } -void TranscriptionToolBar::OnMakeLabel(wxCommandEvent &event) +void TranscriptionToolBar::OnMakeLabel(wxCommandEvent & WXUNUSED(event)) { AudacityProject *p = GetActiveProject(); SetButton(false, mButtons[TTB_MakeLabel]); @@ -815,7 +815,7 @@ double TranscriptionToolBar::GetSensitivity() return (double)mSensitivity; } -void TranscriptionToolBar::OnSensitivitySlider(wxCommandEvent & event) +void TranscriptionToolBar::OnSensitivitySlider(wxCommandEvent & WXUNUSED(event)) { mSensitivity = (mSensitivitySlider->Get()); } @@ -840,7 +840,7 @@ void TranscriptionToolBar::EnableDisableButtons() #endif } -void TranscriptionToolBar::SetKeyType(wxCommandEvent & event) +void TranscriptionToolBar::SetKeyType(wxCommandEvent & WXUNUSED(event)) { int value = mKeyTypeChoice->GetSelection(); diff --git a/src/widgets/AButton.cpp b/src/widgets/AButton.cpp index 4658d7025..39e366a49 100644 --- a/src/widgets/AButton.cpp +++ b/src/widgets/AButton.cpp @@ -212,7 +212,7 @@ AButton::AButtonState AButton::GetState() return state; } -void AButton::OnPaint(wxPaintEvent & event) +void AButton::OnPaint(wxPaintEvent & WXUNUSED(event)) { wxBufferedPaintDC dc(this); @@ -231,12 +231,12 @@ void AButton::OnPaint(wxPaintEvent & event) #endif } -void AButton::OnErase(wxEraseEvent & event) +void AButton::OnErase(wxEraseEvent & WXUNUSED(event)) { // Ignore it to prevent flashing } -void AButton::OnSize(wxSizeEvent & event) +void AButton::OnSize(wxSizeEvent & WXUNUSED(event)) { mFocusRect = GetRect().Deflate( 3, 3 ); Refresh(false); @@ -316,7 +316,7 @@ void AButton::OnMouseEvent(wxMouseEvent & event) } } -void AButton::OnCaptureLost(wxMouseCaptureLostEvent & event) +void AButton::OnCaptureLost(wxMouseCaptureLostEvent & WXUNUSED(event)) { wxMouseEvent e(wxEVT_LEFT_UP); e.m_x = -1; @@ -353,13 +353,13 @@ void AButton::OnKeyDown(wxKeyEvent & event) } } -void AButton::OnSetFocus(wxFocusEvent & event) +void AButton::OnSetFocus(wxFocusEvent & WXUNUSED(event)) { mButtonIsFocused = true; Refresh( false ); } -void AButton::OnKillFocus(wxFocusEvent & event) +void AButton::OnKillFocus(wxFocusEvent & WXUNUSED(event)) { mButtonIsFocused = false; Refresh( false ); diff --git a/src/widgets/ASlider.cpp b/src/widgets/ASlider.cpp index 107250568..88669ae0c 100644 --- a/src/widgets/ASlider.cpp +++ b/src/widgets/ASlider.cpp @@ -145,7 +145,7 @@ BEGIN_EVENT_TABLE(TipPanel, wxPopupWindow) EVT_PAINT(TipPanel::OnPaint) END_EVENT_TABLE() -TipPanel::TipPanel(wxWindow *parent, wxWindowID id, +TipPanel::TipPanel(wxWindow *parent, wxWindowID WXUNUSED(id), wxString label, const wxPoint &pos): wxPopupWindow(TipPanel::sharedDummyParent) { @@ -206,7 +206,7 @@ void TipPanel::SetPos(const wxPoint& pos, wxString maxLabel) #endif -void TipPanel::OnPaint(wxPaintEvent& event) +void TipPanel::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); int width, height, textWidth, textHeight; @@ -591,7 +591,7 @@ void LWSlider::RecreateTipWin() CreatePopWin(); } -void LWSlider::OnPaint(wxDC &dc, bool selected) +void LWSlider::OnPaint(wxDC &dc, bool WXUNUSED(selected)) { //thumbPos should be in pixels int thumbPos = ValueToPosition(mCurrentValue); @@ -1487,12 +1487,12 @@ void ASlider::OnSize(wxSizeEvent &event) mLWSlider->OnSize( event ); } -void ASlider::OnErase(wxEraseEvent &event) +void ASlider::OnErase(wxEraseEvent & WXUNUSED(event)) { // Ignore it to prevent flashing } -void ASlider::OnPaint(wxPaintEvent &event) +void ASlider::OnPaint(wxPaintEvent & WXUNUSED(event)) { wxPaintDC dc(this); @@ -1518,7 +1518,7 @@ void ASlider::OnMouseEvent(wxMouseEvent &event) mLWSlider->OnMouseEvent(event); } -void ASlider::OnCaptureLost(wxMouseCaptureLostEvent &event) +void ASlider::OnCaptureLost(wxMouseCaptureLostEvent & WXUNUSED(event)) { wxMouseEvent e(wxEVT_LEFT_UP); mLWSlider->OnMouseEvent(e); @@ -1529,13 +1529,13 @@ void ASlider::OnKeyEvent(wxKeyEvent &event) mLWSlider->OnKeyEvent(event); } -void ASlider::OnSetFocus(wxFocusEvent & event) +void ASlider::OnSetFocus(wxFocusEvent & WXUNUSED(event)) { mSliderIsFocused = true; Refresh(); } -void ASlider::OnKillFocus(wxFocusEvent & event) +void ASlider::OnKillFocus(wxFocusEvent & WXUNUSED(event)) { mSliderIsFocused = false; Refresh(); diff --git a/src/widgets/ErrorDialog.cpp b/src/widgets/ErrorDialog.cpp index fbb567040..1ee081103 100644 --- a/src/widgets/ErrorDialog.cpp +++ b/src/widgets/ErrorDialog.cpp @@ -157,7 +157,7 @@ ErrorDialog::ErrorDialog( #endif } -void ErrorDialog::OnOk(wxCommandEvent &event) +void ErrorDialog::OnOk(wxCommandEvent & WXUNUSED(event)) { if (dModal) EndModal(true); @@ -269,7 +269,7 @@ void ShowHtmlText(wxWindow *pParent, return; } -void ErrorDialog::OnHelp(wxCommandEvent &event) +void ErrorDialog::OnHelp(wxCommandEvent & WXUNUSED(event)) { if( dhelpURL.StartsWith(wxT("innerlink:")) ) { diff --git a/src/widgets/ExpandingToolBar.cpp b/src/widgets/ExpandingToolBar.cpp index 93cda6a12..b69323d2c 100644 --- a/src/widgets/ExpandingToolBar.cpp +++ b/src/widgets/ExpandingToolBar.cpp @@ -172,7 +172,7 @@ ExpandingToolBar::~ExpandingToolBar() { } -void ExpandingToolBar::OnSize(wxSizeEvent &evt) +void ExpandingToolBar::OnSize(wxSizeEvent & WXUNUSED(event)) { if (mFrameParent || mDialogParent || mAreaParent) return; @@ -212,7 +212,7 @@ void ExpandingToolBar::OnSize(wxSizeEvent &evt) } } -void ExpandingToolBar::OnToggle(wxCommandEvent &evt) +void ExpandingToolBar::OnToggle(wxCommandEvent & WXUNUSED(event)) { if (mIsExpanded) Collapse(); @@ -464,7 +464,7 @@ void ExpandingToolBar::MoveDrawer(wxSize prevSize) } } -void ExpandingToolBar::OnTimer(wxTimerEvent &evt) +void ExpandingToolBar::OnTimer(wxTimerEvent & WXUNUSED(event)) { if (mAutoExpand && msNoAutoExpandStack==0 && IsCursorInWindow()) @@ -714,14 +714,14 @@ void ToolBarGrabber::OnMouse(wxMouseEvent &event) Refresh(false); } -void ToolBarGrabber::OnPaint(wxPaintEvent &evt) +void ToolBarGrabber::OnPaint(wxPaintEvent & WXUNUSED(event)) { wxPaintDC dc(this); mImageRoll[mState].Draw(dc, GetClientRect()); } -void ToolBarGrabber::OnSize(wxSizeEvent &evt) +void ToolBarGrabber::OnSize(wxSizeEvent & WXUNUSED(event)) { Refresh(false); } @@ -1105,7 +1105,7 @@ void ToolBarArea::Fit(bool horizontal, bool vertical) } } -void ToolBarArea::OnSize(wxSizeEvent &evt) +void ToolBarArea::OnSize(wxSizeEvent & WXUNUSED(event)) { if (mInOnSize) return; diff --git a/src/widgets/Grabber.cpp b/src/widgets/Grabber.cpp index 3d8e7f3f1..1bd637332 100644 --- a/src/widgets/Grabber.cpp +++ b/src/widgets/Grabber.cpp @@ -198,7 +198,7 @@ void Grabber::OnLeftDown(wxMouseEvent & event) // // Handle mouse enter events // -void Grabber::OnEnter(wxMouseEvent & event) +void Grabber::OnEnter(wxMouseEvent & WXUNUSED(event)) { // Redraw highlighted mOver = true; @@ -208,7 +208,7 @@ void Grabber::OnEnter(wxMouseEvent & event) // // Handle mouse leave events // -void Grabber::OnLeave(wxMouseEvent & event) +void Grabber::OnLeave(wxMouseEvent & WXUNUSED(event)) { if (!GetCapture()) { // Redraw plain @@ -220,7 +220,7 @@ void Grabber::OnLeave(wxMouseEvent & event) // // Handle the paint events // -void Grabber::OnPaint(wxPaintEvent & event) +void Grabber::OnPaint(wxPaintEvent & WXUNUSED(event)) { wxPaintDC dc(this); diff --git a/src/widgets/Grid.cpp b/src/widgets/Grid.cpp index 07e585eaa..96fb6af41 100644 --- a/src/widgets/Grid.cpp +++ b/src/widgets/Grid.cpp @@ -207,8 +207,8 @@ void TimeRenderer::Draw(wxGrid &grid, } wxSize TimeRenderer::GetBestSize(wxGrid &grid, - wxGridCellAttr &attr, - wxDC &dc, + wxGridCellAttr & WXUNUSED(attr), + wxDC & WXUNUSED(dc), int row, int col) { diff --git a/src/widgets/ImageRoll.cpp b/src/widgets/ImageRoll.cpp index ea5ac0406..bec06b1b7 100644 --- a/src/widgets/ImageRoll.cpp +++ b/src/widgets/ImageRoll.cpp @@ -311,7 +311,7 @@ void ImageRoll::DrawBitmap(wxDC &dc, wxBitmap &bitmap, } } -void ImageRoll::Draw(wxDC &dc, wxRect rect, int logicalFunc) +void ImageRoll::Draw(wxDC &dc, wxRect rect, int WXUNUSED(logicalFunc)) { int width = rect.width; int height = rect.height; @@ -439,14 +439,14 @@ void ImageRollPanel::SetLogicalFunction(int func) mLogicalFunction = func; } -void ImageRollPanel::OnPaint(wxPaintEvent &evt) +void ImageRollPanel::OnPaint(wxPaintEvent & WXUNUSED(event)) { wxPaintDC dc(this); mImageRoll.Draw(dc, GetClientRect(), mLogicalFunction); } -void ImageRollPanel::OnSize(wxSizeEvent &evt) +void ImageRollPanel::OnSize(wxSizeEvent & WXUNUSED(event)) { Refresh(false); } diff --git a/src/widgets/LinkingHtmlWindow.cpp b/src/widgets/LinkingHtmlWindow.cpp index 06a8c499b..e69adb7f9 100644 --- a/src/widgets/LinkingHtmlWindow.cpp +++ b/src/widgets/LinkingHtmlWindow.cpp @@ -34,19 +34,19 @@ BEGIN_EVENT_TABLE(BrowserFrame, wxFrame) END_EVENT_TABLE() -void BrowserFrame::OnForward(wxCommandEvent & event) +void BrowserFrame::OnForward(wxCommandEvent & WXUNUSED(event)) { mpHtml->HistoryForward(); UpdateButtons(); } -void BrowserFrame::OnBackward(wxCommandEvent & event) +void BrowserFrame::OnBackward(wxCommandEvent & WXUNUSED(event)) { mpHtml->HistoryBack(); UpdateButtons(); } -void BrowserFrame::OnClose(wxCommandEvent & event) +void BrowserFrame::OnClose(wxCommandEvent & WXUNUSED(event)) { Close(); } diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp index f26bb4448..8dbeb9aa1 100644 --- a/src/widgets/Meter.cpp +++ b/src/widgets/Meter.cpp @@ -302,7 +302,7 @@ void Meter::Clear() mQueue.Clear(); } -void Meter::CreateIcon(int aquaOffset) +void Meter::CreateIcon(int WXUNUSED(aquaOffset)) { /// \todo Remove wasteful delete/new pair. It is done in every call to layout. if (mIcon) { @@ -346,12 +346,12 @@ void Meter::UpdatePrefs() mMeterDisabled = gPrefs->Read(wxT("/Meter/MeterOutputDisabled"), (long)0); } -void Meter::OnErase(wxEraseEvent &evt) +void Meter::OnErase(wxEraseEvent & WXUNUSED(event)) { // Ignore it to prevent flashing } -void Meter::OnPaint(wxPaintEvent &evt) +void Meter::OnPaint(wxPaintEvent & WXUNUSED(event)) { wxPaintDC dc(this); #ifdef __WXMAC__ @@ -368,7 +368,7 @@ void Meter::OnPaint(wxPaintEvent &evt) #endif } -void Meter::OnSize(wxSizeEvent &evt) +void Meter::OnSize(wxSizeEvent & WXUNUSED(event)) { delete mBitmap; mBitmap = NULL; @@ -631,7 +631,7 @@ void Meter::UpdateDisplay(int numChannels, int numFrames, float *sampleData) // mQueue.Put(msg); //} -void Meter::OnMeterUpdate(wxTimerEvent &evt) +void Meter::OnMeterUpdate(wxTimerEvent & WXUNUSED(event)) { MeterUpdateMsg msg; int numChanges = 0; @@ -1170,7 +1170,7 @@ void Meter::StartMonitoring() // Pop-up menu handlers // -void Meter::OnDisableMeter(wxCommandEvent &evt) +void Meter::OnDisableMeter(wxCommandEvent & WXUNUSED(event)) { if (mMeterDisabled) //Enable { @@ -1219,50 +1219,50 @@ void Meter::OnDisableMeter(wxCommandEvent &evt) gPrefs->Flush(); } -void Meter::OnHorizontal(wxCommandEvent &evt) +void Meter::OnHorizontal(wxCommandEvent & WXUNUSED(event)) { SetStyle(HorizontalStereo); } -void Meter::OnVertical(wxCommandEvent &evt) +void Meter::OnVertical(wxCommandEvent & WXUNUSED(event)) { SetStyle(VerticalStereo); } -void Meter::OnMulti(wxCommandEvent &evt) +void Meter::OnMulti(wxCommandEvent & WXUNUSED(event)) { SetStyle(VerticalMulti); } -void Meter::OnEqualizer(wxCommandEvent &evt) +void Meter::OnEqualizer(wxCommandEvent & WXUNUSED(event)) { SetStyle(Equalizer); } -void Meter::OnWaveform(wxCommandEvent &evt) +void Meter::OnWaveform(wxCommandEvent & WXUNUSED(event)) { SetStyle(Waveform); } -void Meter::OnLinear(wxCommandEvent &evt) +void Meter::OnLinear(wxCommandEvent & WXUNUSED(event)) { mDB = false; mLayoutValid = false; Refresh(false); } -void Meter::OnDB(wxCommandEvent &evt) +void Meter::OnDB(wxCommandEvent & WXUNUSED(event)) { mDB = true; mLayoutValid = false; Refresh(false); } -void Meter::OnClip(wxCommandEvent &evt) +void Meter::OnClip(wxCommandEvent & WXUNUSED(event)) { } -void Meter::OnMonitor(wxCommandEvent &evt) +void Meter::OnMonitor(wxCommandEvent & WXUNUSED(event)) { StartMonitoring(); } @@ -1280,11 +1280,11 @@ void Meter::OnAutomatedInputLevelAdjustment(wxCommandEvent &evt) } #endif -void Meter::OnFloat(wxCommandEvent &evt) +void Meter::OnFloat(wxCommandEvent & WXUNUSED(event)) { } -void Meter::OnPreferences(wxCommandEvent &evt) +void Meter::OnPreferences(wxCommandEvent & WXUNUSED(event)) { wxNumberEntryDialog d(this, diff --git a/src/widgets/ProgressDialog.cpp b/src/widgets/ProgressDialog.cpp index cd64c05df..cc69379e6 100644 --- a/src/widgets/ProgressDialog.cpp +++ b/src/widgets/ProgressDialog.cpp @@ -1470,14 +1470,14 @@ ProgressDialog::SetMessage(const wxString & message) } void -ProgressDialog::OnCancel(wxCommandEvent & e) +ProgressDialog::OnCancel(wxCommandEvent & WXUNUSED(event)) { FindWindowById(wxID_CANCEL, this)->Disable(); mCancel = true; } void -ProgressDialog::OnStop(wxCommandEvent & e) +ProgressDialog::OnStop(wxCommandEvent & WXUNUSED(event)) { FindWindowById(wxID_OK, this)->Disable(); mCancel = false; diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp index 629e00aa5..25db1e09d 100644 --- a/src/widgets/Ruler.cpp +++ b/src/widgets/Ruler.cpp @@ -531,6 +531,8 @@ void Ruler::FindLinearTickSizes(double UPP) // More than 10 digit numbers? Something is badly wrong. // Probably units is coming in with too high a value. wxASSERT( mDigits >= -10 ); + if( mDigits < -10 ) + break; } mMinor = d; mMajor = d * 2.0; @@ -557,6 +559,8 @@ void Ruler::FindLinearTickSizes(double UPP) // More than 10 digit numbers? Something is badly wrong. // Probably units is coming in with too high a value. wxASSERT( mDigits >= -10 ); + if( mDigits < -10 ) + break; } mDigits++; mMinor = d; diff --git a/src/widgets/TimeTextCtrl.cpp b/src/widgets/TimeTextCtrl.cpp index e997d2a0c..cacb3064c 100644 --- a/src/widgets/TimeTextCtrl.cpp +++ b/src/widgets/TimeTextCtrl.cpp @@ -900,12 +900,12 @@ void TimeTextCtrl::Fit() SetInitialSize(sz); } -void TimeTextCtrl::OnErase(wxEraseEvent & event) +void TimeTextCtrl::OnErase(wxEraseEvent & WXUNUSED(event)) { // Ignore it to prevent flashing } -void TimeTextCtrl::OnPaint(wxPaintEvent &event) +void TimeTextCtrl::OnPaint(wxPaintEvent & WXUNUSED(event)) { wxPaintDC dc(this); bool focused = (FindFocus() == this); diff --git a/src/widgets/Warning.cpp b/src/widgets/Warning.cpp index 4d2134256..31133b309 100644 --- a/src/widgets/Warning.cpp +++ b/src/widgets/Warning.cpp @@ -71,7 +71,7 @@ WarningDialog::WarningDialog(wxWindow *parent, wxString message, bool showCancel CentreOnParent(); } -void WarningDialog::OnOK(wxCommandEvent& event) +void WarningDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { EndModal(mCheckBox->GetValue() ? wxID_NO : wxID_YES); // return YES, if message should be shown again }