X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fhtml_dialog.cc;h=978330187f13fe4c40c6d64a5aaf938a2149167d;hp=b5f86e7a131de7c823fd4cb293e0d82d069f7e99;hb=e3c78ffdb5e562841e86e6f59a20494159c44de7;hpb=183b5597f73b85c0d6d29db8f6ed519386d07aa9

diff --git a/src/wx/html_dialog.cc b/src/wx/html_dialog.cc
index b5f86e7a1..978330187 100644
--- a/src/wx/html_dialog.cc
+++ b/src/wx/html_dialog.cc
@@ -21,11 +21,18 @@
 #include "html_dialog.h"
 #include "wx_util.h"
 #include "lib/cross.h"
+#include "lib/warnings.h"
 #include <boost/filesystem.hpp>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wxhtml.h>
 #include <wx/fs_mem.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
 HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html)
 	: wxDialog (parent, wxID_ANY, title)
 {
@@ -36,7 +43,7 @@ HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html)
 	/* Add some resources that are used by HTML passed into this dialog */
 	wxMemoryFSHandler::AddFile(
 		"me.jpg",
-		wxBitmap(std_to_wx(boost::filesystem::path(shared_path() / "me.jpg").string()), wxBITMAP_TYPE_JPEG), wxBITMAP_TYPE_JPEG
+		wxBitmap(std_to_wx(boost::filesystem::path(resources_path() / "me.jpg").string()), wxBITMAP_TYPE_JPEG), wxBITMAP_TYPE_JPEG
 		);
 
 	wxHtmlWindow* h = new wxHtmlWindow (this);