diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-10-18 20:01:44 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-10-19 00:43:11 +0200 |
| commit | 9f240f0ca0e4050447705f8bd0c0e0ee0aad1960 (patch) | |
| tree | 2a975398086ad82d7ec1198872472dbf8de6ffc3 | |
| parent | 3664564081a3cdcd192de78af8b19881153c22f5 (diff) | |
Tidy up and fix bitmap path finding in the playlist editor.
| -rw-r--r-- | src/tools/dcpomatic_playlist.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc index 6bf2e20b4..baeeb96be 100644 --- a/src/tools/dcpomatic_playlist.cc +++ b/src/tools/dcpomatic_playlist.cc @@ -273,15 +273,8 @@ public: wxImageList* images = new wxImageList (16, 16); wxIcon tick_icon; wxIcon no_tick_icon; -#ifdef DCPOMATIC_OSX - tick_icon.LoadFile ("tick.png", wxBITMAP_TYPE_PNG_RESOURCE); - no_tick_icon.LoadFile ("no_tick.png", wxBITMAP_TYPE_PNG_RESOURCE); -#else - boost::filesystem::path tick_path = resources_path() / "tick.png"; - tick_icon.LoadFile (std_to_wx(tick_path.string()), wxBITMAP_TYPE_PNG); - boost::filesystem::path no_tick_path = resources_path() / "no_tick.png"; - no_tick_icon.LoadFile (std_to_wx(no_tick_path.string()), wxBITMAP_TYPE_PNG); -#endif + tick_icon.LoadFile (bitmap_path("tick"), wxBITMAP_TYPE_PNG); + no_tick_icon.LoadFile (bitmap_path("no_tick"), wxBITMAP_TYPE_PNG); images->Add (tick_icon); images->Add (no_tick_icon); |