diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-09-14 13:09:04 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-14 13:09:04 +0200 |
| commit | e3c78ffdb5e562841e86e6f59a20494159c44de7 (patch) | |
| tree | 81a4384eafabbd84975ccbb733c944cb6205cb46 /src/wx | |
| parent | 4c804a0d92ebd03b70bfc7f736fcaf5f77cb3bb7 (diff) | |
Rename shared_path -> resources_path.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/html_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/wx_util.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/html_dialog.cc b/src/wx/html_dialog.cc index 57038f77f..978330187 100644 --- a/src/wx/html_dialog.cc +++ b/src/wx/html_dialog.cc @@ -43,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); diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 46b122a8a..e90d2f848 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -473,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 (); @@ -583,10 +583,10 @@ bitmap_path (string name) if (path) { base = path; } else { - base = shared_path(); + base = resources_path(); } #else - base = shared_path(); + base = resources_path(); #endif boost::filesystem::path p = base / String::compose("%1.png", name); |