X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fhtml_dialog.cc;h=978330187f13fe4c40c6d64a5aaf938a2149167d;hb=e3c78ffdb5e562841e86e6f59a20494159c44de7;hp=873aa718cf5026da1bd3b29c1cca1395b1dae0aa;hpb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;p=dcpomatic.git diff --git a/src/wx/html_dialog.cc b/src/wx/html_dialog.cc index 873aa718c..978330187 100644 --- a/src/wx/html_dialog.cc +++ b/src/wx/html_dialog.cc @@ -29,6 +29,10 @@ DCPOMATIC_DISABLE_WARNINGS DCPOMATIC_ENABLE_WARNINGS #include +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html) : wxDialog (parent, wxID_ANY, title) { @@ -39,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);