}
Message const& m = _messages[index];
- wxBitmap bitmap (bitmap_path("help/" + m.id));
+ boost::filesystem::path path = bitmap_directory() / "help" / String::compose("%1.png", m.id);
+ wxBitmap bitmap (std_to_wx(path.string()));
wxPoint pos;
if (m.anchor_point) {
pos = *m.anchor_point;
}
-wxString
-bitmap_path (string name)
+boost::filesystem::path
+bitmap_directory ()
{
- boost::filesystem::path base;
-
#ifdef DCPOMATIC_DEBUG
/* Hack to allow OS X to find icons when running from the source tree */
char* path = getenv ("DCPOMATIC_GRAPHICS");
if (path) {
- base = path;
- } else {
- base = shared_path();
+ return path;
}
-#else
- base = shared_path();
#endif
- boost::filesystem::path p = base / String::compose("%1.png", name);
- return std_to_wx (p.string());
+ return shared_path();
}
+
+wxString
+bitmap_path (string name)
+{
+ boost::filesystem::path p = bitmap_directory() / String::compose("%1.png", name);
+ return std_to_wx (p.string());
+}
extern double calculate_mark_interval (double start);
extern bool display_progress (wxString title, wxString task);
extern bool report_errors_from_last_job (wxWindow* parent);
+extern boost::filesystem::path bitmap_directory ();
extern wxString bitmap_path (std::string name);
struct Offset