projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename shared_path -> resources_path.
[dcpomatic.git]
/
src
/
wx
/
html_dialog.cc
diff --git
a/src/wx/html_dialog.cc
b/src/wx/html_dialog.cc
index b5f86e7a131de7c823fd4cb293e0d82d069f7e99..978330187f13fe4c40c6d64a5aaf938a2149167d 100644
(file)
--- 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 "html_dialog.h"
#include "wx_util.h"
#include "lib/cross.h"
+#include "lib/warnings.h"
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wxhtml.h>
#include <wx/fs_mem.h>
#include <wx/wxhtml.h>
#include <wx/fs_mem.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <iostream>
#include <iostream>
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html)
: wxDialog (parent, wxID_ANY, title)
{
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",
/* 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);
);
wxHtmlWindow* h = new wxHtmlWindow (this);