From: Carl Hetherington <cth@carlh.net>
Date: Tue, 23 Feb 2021 00:47:21 +0000 (+0100)
Subject: Remove wxSTAY_ON_TOP from splash screen on Windows to stop it hiding
X-Git-Tag: v2.14.55
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=af98c4c415eb8093a85d60c4ce38c806ab188fe9;p=dcpomatic.git

Remove wxSTAY_ON_TOP from splash screen on Windows to stop it hiding
error dialogues that pop up during startup.

Backported-from-commit: 998ebab3fafd238a49d4ececeecb4bbf9f17b699
Backported-from-branch: v2.15.x
---

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) {