Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-04 14:19:30 +02:00
Code Issues Releases Wiki Activity

Merge pull request #44 from daavery/master

Browse Source 
update for wx3
This commit is contained in:
Leland Lucius 2015-05-16 16:22:33 -05:00
commit 19e10ec81a
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/effects/Effect.cpp
View File

@ -3032,7 +3032,7 @@ void EffectUIHost::OnInitDialog(wxInitDialogEvent & evt)
wxDialog::OnInitDialog(evt); wxDialog::OnInitDialog(evt);
#if wxCHECK_VERSION(3, 0, 0) #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 #endif
// Pure hackage coming down the pike... // Pure hackage coming down the pike...

4
src/widgets/ErrorDialog.h
View File

@ -46,11 +46,15 @@ class HtmlTextHelpDialog : public BrowserFrame
public: public:
HtmlTextHelpDialog() : BrowserFrame() HtmlTextHelpDialog() : BrowserFrame()
{ {
#if !wxCHECK_VERSION(3, 1, 0)
MakeModal( true ); MakeModal( true );
#endif
} }
virtual ~HtmlTextHelpDialog() virtual ~HtmlTextHelpDialog()
{ {
#if !wxCHECK_VERSION(3, 1, 0)
MakeModal( false ); MakeModal( false );
#endif
// On Windows, for some odd reason, the Audacity window will be sent to // On Windows, for some odd reason, the Audacity window will be sent to
// the back. So, make sure that doesn't happen. // the back. So, make sure that doesn't happen.
GetParent()->Raise(); GetParent()->Raise();

9
src/widgets/ProgressDialog.cpp
View File

@ -1392,8 +1392,11 @@ ProgressDialog::Update(int value, const wxString & message)
mLastUpdate = now; mLastUpdate = now;
} }
#if wxCHECK_VERSION(3, 0, 0)
wxEventLoopBase *loop = wxEventLoop::GetActive();
#else
wxEventLoop *loop = wxEventLoop::GetActive(); wxEventLoop *loop = wxEventLoop::GetActive();
#endif
if (loop) if (loop)
{ {
int i = 10; int i = 10;
@ -1627,7 +1630,11 @@ int TimerProgressDialog::Update(const wxString & message /*= wxEmptyString*/)
mLastUpdate = now; mLastUpdate = now;
} }
#if wxCHECK_VERSION(3, 0, 0)
wxEventLoopBase *loop = wxEventLoop::GetActive();
#else
wxEventLoop *loop = wxEventLoop::GetActive(); wxEventLoop *loop = wxEventLoop::GetActive();
#endif
if (loop) if (loop)
{ {
int i = 10; int i = 10;