From 193603551f7412ebb5fd743dda7a2c8a7c43b2a2 Mon Sep 17 00:00:00 2001 From: david avery Date: Sat, 16 May 2015 14:38:51 -0600 Subject: [PATCH 1/2] wx3 fix --- src/widgets/ProgressDialog.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/widgets/ProgressDialog.cpp b/src/widgets/ProgressDialog.cpp index ee7f0d454..e30f9e8c8 100644 --- a/src/widgets/ProgressDialog.cpp +++ b/src/widgets/ProgressDialog.cpp @@ -1392,8 +1392,11 @@ ProgressDialog::Update(int value, const wxString & message) mLastUpdate = now; } - +#if wxCHECK_VERSION(3, 0, 0) + wxEventLoopBase *loop = wxEventLoop::GetActive(); +#else wxEventLoop *loop = wxEventLoop::GetActive(); +#endif if (loop) { int i = 10; @@ -1627,7 +1630,11 @@ int TimerProgressDialog::Update(const wxString & message /*= wxEmptyString*/) mLastUpdate = now; } +#if wxCHECK_VERSION(3, 0, 0) + wxEventLoopBase *loop = wxEventLoop::GetActive(); +#else wxEventLoop *loop = wxEventLoop::GetActive(); +#endif if (loop) { int i = 10; From 72385c7faf205189723cc402c67aaebfe3147ac9 Mon Sep 17 00:00:00 2001 From: david avery Date: Sat, 16 May 2015 14:40:29 -0600 Subject: [PATCH 2/2] wx3 --- src/effects/Effect.cpp | 2 +- src/widgets/ErrorDialog.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index 720eb1ec2..c2bf55d53 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -2967,7 +2967,7 @@ void EffectUIHost::OnInitDialog(wxInitDialogEvent & evt) wxDialog::OnInitDialog(evt); #if wxCHECK_VERSION(3, 0, 0) -#warning "check to see if this still needed in wx3" +//#warning "check to see if this still needed in wx3" #endif // Pure hackage coming down the pike... diff --git a/src/widgets/ErrorDialog.h b/src/widgets/ErrorDialog.h index b717a52b9..122e8409b 100644 --- a/src/widgets/ErrorDialog.h +++ b/src/widgets/ErrorDialog.h @@ -46,11 +46,15 @@ class HtmlTextHelpDialog : public BrowserFrame public: HtmlTextHelpDialog() : BrowserFrame() { +#if !wxCHECK_VERSION(3, 1, 0) MakeModal( true ); +#endif } virtual ~HtmlTextHelpDialog() { +#if !wxCHECK_VERSION(3, 1, 0) MakeModal( false ); +#endif // On Windows, for some odd reason, the Audacity window will be sent to // the back. So, make sure that doesn't happen. GetParent()->Raise();