From 1b07ae1ad1ab04a3d96382eb6aa3a96410d09ca3 Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Tue, 28 Jul 2015 15:47:19 -0500 Subject: [PATCH] Some wx3 fixes --- src/AudacityApp.cpp | 1 - src/TrackPanel.cpp | 2 +- src/prefs/SpectrogramSettings.cpp | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index 946ab0493..8003e3973 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -1564,7 +1564,6 @@ bool AudacityApp::InitTempDir() // Failed wxMessageBox(_("Audacity could not find a place to store temporary files.\nPlease enter an appropriate directory in the preferences dialog.")); - PrefsDialog dialog(NULL); // Only want one page of the preferences DirectoriesPrefsFactory directoriesPrefsFactory; PrefsDialog::Factories factories; diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index 2c883f9d3..d5c49da0f 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -1054,7 +1054,7 @@ void TrackPanel::OnTimer() { wxCommandEvent e(EVT_TRACK_PANEL_TIMER); - p->ProcessEvent(e); + p->GetEventHandler()->ProcessEvent(e); } #ifdef EXPERIMENTAL_SCRUBBING_BASIC diff --git a/src/prefs/SpectrogramSettings.cpp b/src/prefs/SpectrogramSettings.cpp index ff2c1649a..8f084e4d4 100644 --- a/src/prefs/SpectrogramSettings.cpp +++ b/src/prefs/SpectrogramSettings.cpp @@ -341,13 +341,13 @@ void SpectrogramSettings::SavePrefs() gPrefs->Write(wxT("/Spectrum/Grayscale"), isGrayscale); - gPrefs->Write(wxT("/Spectrum/ScaleType"), scaleType); + gPrefs->Write(wxT("/Spectrum/ScaleType"), (int) scaleType); #ifndef SPECTRAL_SELECTION_GLOBAL_SWITCH gPrefs->Write(wxT("/Spectrum/EnableSpectralSelection"), spectralSelection); #endif - gPrefs->Write(wxT("/Spectrum/Algorithm"), algorithm); + gPrefs->Write(wxT("/Spectrum/Algorithm"), (int) algorithm); #ifdef EXPERIMENTAL_FFT_Y_GRID gPrefs->Write(wxT("/Spectrum/FFTYGrid"), fftYGrid);