mirror of
https://github.com/cookiengineer/audacity
synced 2025-07-09 17:07:43 +02:00
Disable splash screen in wx3 whilst we work out what the problem is with showing a dialog and a splash screen at the same time.
This commit is contained in:
parent
c512822138
commit
466287b46e
@ -1214,10 +1214,13 @@ void AudacityApp::OnEventLoopEnter(wxEventLoopBase * pLoop)
|
|||||||
// to show a dialog (for module loading) during initialisation.
|
// to show a dialog (for module loading) during initialisation.
|
||||||
// without it messing up the splash screen.
|
// without it messing up the splash screen.
|
||||||
// Hasn't actually fixed that yet, but is addressing the point
|
// Hasn't actually fixed that yet, but is addressing the point
|
||||||
// they make in thei rrelease notes.
|
// they make in their release notes.
|
||||||
void AudacityApp::FinishInits()
|
void AudacityApp::FinishInits()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
// No Splash screen on wx3 whislt we sort out the problem
|
||||||
|
// with showing a dialog AND a splash screen during inits.
|
||||||
|
#if !wxCHECK_VERSION(3, 0, 0)
|
||||||
// BG: Create a temporary window to set as the top window
|
// BG: Create a temporary window to set as the top window
|
||||||
wxImage logoimage((const char **) AudacityLogoWithName_xpm);
|
wxImage logoimage((const char **) AudacityLogoWithName_xpm);
|
||||||
logoimage.Rescale(logoimage.GetWidth() / 2, logoimage.GetHeight() / 2);
|
logoimage.Rescale(logoimage.GetWidth() / 2, logoimage.GetHeight() / 2);
|
||||||
@ -1234,7 +1237,7 @@ void AudacityApp::FinishInits()
|
|||||||
wxSTAY_ON_TOP);
|
wxSTAY_ON_TOP);
|
||||||
temporarywindow->SetTitle(_("Audacity is starting up..."));
|
temporarywindow->SetTitle(_("Audacity is starting up..."));
|
||||||
SetTopWindow(temporarywindow);
|
SetTopWindow(temporarywindow);
|
||||||
|
#endif
|
||||||
|
|
||||||
//JKC: Would like to put module loading here.
|
//JKC: Would like to put module loading here.
|
||||||
|
|
||||||
@ -1288,10 +1291,11 @@ void AudacityApp::FinishInits()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#if !wxCHECK_VERSION(3, 0, 0)
|
||||||
temporarywindow->Show(false);
|
temporarywindow->Show(false);
|
||||||
delete temporarywindow;
|
delete temporarywindow;
|
||||||
|
#endif
|
||||||
|
|
||||||
if( project->mShowSplashScreen )
|
if( project->mShowSplashScreen )
|
||||||
project->OnHelpWelcome();
|
project->OnHelpWelcome();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user