diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-02-23 01:47:21 +0100 |
|---|---|---|
| committer | cah <cah@ableton.com> | 2021-09-10 22:38:55 +0200 |
| commit | af98c4c415eb8093a85d60c4ce38c806ab188fe9 (patch) | |
| tree | bffe4bcc285157bc7361083e04d7460dbe6140b0 | |
| parent | e1a135081818693bc20c3f221d2ad21eff74d499 (diff) | |
Remove wxSTAY_ON_TOP from splash screen on Windows to stop it hidingv2.14.55
error dialogues that pop up during startup.
Backported-from-commit: 998ebab3fafd238a49d4ececeecb4bbf9f17b699
Backported-from-branch: v2.15.x
| -rw-r--r-- | src/wx/wx_util.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index bb343b470..619b450be 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -469,6 +469,7 @@ setup_audio_channels_choice (wxChoice* choice, int minimum) checked_set (choice, items); } + wxSplashScreen * maybe_show_splash () { @@ -477,7 +478,12 @@ maybe_show_splash () wxBitmap bitmap; boost::filesystem::path p = shared_path () / "splash.png"; if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) { +#ifdef DCPOMATIC_WINDOWS + /* Having wxSTAY_ON_TOP means error dialogues hide behind the splash screen on Windows, no matter what I try */ + splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE | wxFRAME_NO_TASKBAR); +#else splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1); +#endif wxYield (); } } catch (boost::filesystem::filesystem_error& e) { |