diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-02-23 01:47:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-02-23 20:11:23 +0100 |
| commit | 998ebab3fafd238a49d4ececeecb4bbf9f17b699 (patch) | |
| tree | 0209867e091986f2ad528b11402af7f31f483ea2 /src/wx/wx_util.cc | |
| parent | 41262015eb2bb1fc3da8585883420975de381a65 (diff) | |
Remove wxSTAY_ON_TOP from splash screen on Windows to stop it hiding
error dialogues that pop up during startup.
Diffstat (limited to 'src/wx/wx_util.cc')
| -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 192724b13..77980a013 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -476,6 +476,7 @@ setup_audio_channels_choice (wxChoice* choice, int minimum) checked_set (choice, items); } + wxSplashScreen * maybe_show_splash () { @@ -483,7 +484,12 @@ maybe_show_splash () try { wxBitmap bitmap; if (bitmap.LoadFile(bitmap_path("splash"), 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) { |