projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
src
/
wx
/
wx_util.cc
diff --git
a/src/wx/wx_util.cc
b/src/wx/wx_util.cc
index 5f5a96a46a6f956cfcf30ebbfd7ea78762d8de6c..28ac6ab5c5b4bb4bace0bec0020ffd4c82aa1453 100644
(file)
--- a/
src/wx/wx_util.cc
+++ b/
src/wx/wx_util.cc
@@
-222,14
+222,14
@@
string_client_data (wxClientData* o)
void
checked_set (FilePickerCtrl* widget, boost::filesystem::path value)
{
void
checked_set (FilePickerCtrl* widget, boost::filesystem::path value)
{
- if (widget->
GetPath() != std_to_wx (value.string())
) {
+ if (widget->
path() != value
) {
if (value.empty()) {
/* Hack to make wxWidgets clear the control when we are passed
an empty value.
*/
value = " ";
}
if (value.empty()) {
/* Hack to make wxWidgets clear the control when we are passed
an empty value.
*/
value = " ";
}
- widget->
SetPath (std_to_wx (value.string())
);
+ widget->
set_path(value
);
}
}
}
}
@@
-670,6
+670,10
@@
bitmap_path (string name)
} else {
base = resources_path();
}
} else {
base = resources_path();
}
+
+ if (!boost::filesystem::exists(base / name)) {
+ base = path / boost::filesystem::path("osx/preferences");
+ }
#else
base = resources_path();
#endif
#else
base = resources_path();
#endif