From 30317efa037aac6e99b0133326f6a7bf12ac553a Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 25 Jun 2017 13:19:44 -0400 Subject: [PATCH] fix Windows build --- src/prefs/PrefsPanel.h | 2 +- src/prefs/SpectrumPrefs.cpp | 4 +++- src/prefs/SpectrumPrefs.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/prefs/PrefsPanel.h b/src/prefs/PrefsPanel.h index fa18b710b..d5680defb 100644 --- a/src/prefs/PrefsPanel.h +++ b/src/prefs/PrefsPanel.h @@ -53,7 +53,7 @@ class PrefsPanel /* not final */ : public wxPanelWrapper virtual ~PrefsPanel(); // NEW virtuals - virtual bool Preview() {} // Make tentative changes + virtual void Preview() {} // Make tentative changes virtual bool Commit() = 0; // used to be called "Apply" // If it returns True, the Preview button is added below the panel diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp index d52fa31cf..33225f1a9 100644 --- a/src/prefs/SpectrumPrefs.cpp +++ b/src/prefs/SpectrumPrefs.cpp @@ -416,7 +416,7 @@ void SpectrumPrefs::Rollback() } } -bool SpectrumPrefs::Preview() +void SpectrumPrefs::Preview() { if (!Validate()) return false; @@ -487,6 +487,8 @@ bool SpectrumPrefs::Commit() SpectrogramSettings *const pSettings = &SpectrogramSettings::defaults(); pSettings->SavePrefs(); } + + return true; } bool SpectrumPrefs::ShowsPreviewButton() diff --git a/src/prefs/SpectrumPrefs.h b/src/prefs/SpectrumPrefs.h index 8f0036cc2..ac4c7caca 100644 --- a/src/prefs/SpectrumPrefs.h +++ b/src/prefs/SpectrumPrefs.h @@ -44,7 +44,7 @@ class SpectrumPrefs final : public PrefsPanel public: SpectrumPrefs(wxWindow * parent, WaveTrack *wt); virtual ~SpectrumPrefs(); - bool Preview() override; + void Preview() override; bool Commit() override; void Rollback(); bool ShowsPreviewButton() override;