X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=e90d2f8481d49b3f731a05af42a7e021bebf0ff1;hp=6eef0d14795020f0cab6481e76e98ba9687e6567;hb=e3c78ffdb5e562841e86e6f59a20494159c44de7;hpb=581797d640af1572f884ddf4395924894b745b3a

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 6eef0d147..e90d2f848 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -31,11 +31,14 @@
 #include "lib/util.h"
 #include "lib/cross.h"
 #include "lib/job.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
 #include <wx/splash.h>
 #include <wx/progdlg.h>
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 
 using std::string;
@@ -470,7 +473,7 @@ maybe_show_splash ()
 	wxSplashScreen* splash = 0;
 	try {
 		wxBitmap bitmap;
-		boost::filesystem::path p = shared_path () / "splash.png";
+		boost::filesystem::path p = resources_path() / "splash.png";
 		if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) {
 			splash = new wxSplashScreen (bitmap, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT, 0, 0, -1);
 			wxYield ();
@@ -567,3 +570,26 @@ get_offsets (vector<Offset>& offsets)
 
 	return utc;
 }
+
+
+wxString
+bitmap_path (string name)
+{
+	boost::filesystem::path base;
+
+#ifdef DCPOMATIC_DEBUG
+	/* Hack to allow OS X to find icons when running from the source tree */
+	char* path = getenv ("DCPOMATIC_GRAPHICS");
+	if (path) {
+		base = path;
+	} else {
+		base = resources_path();
+	}
+#else
+	base = resources_path();
+#endif
+
+	boost::filesystem::path p = base / String::compose("%1.png", name);
+	return std_to_wx (p.string());
+}
+