projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
010610c
)
boost filesystem hack.
author
Carl Hetherington
<cth@carlh.net>
Fri, 27 Jul 2012 00:49:30 +0000
(
01:49
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 27 Jul 2012 00:49:30 +0000
(
01:49
+0100)
src/wx/dir_picker_ctrl.cc
patch
|
blob
|
history
diff --git
a/src/wx/dir_picker_ctrl.cc
b/src/wx/dir_picker_ctrl.cc
index 4cd7c3d155e5586f091d538df9f1d4ca5596a26e..05b680288c248baaf0605f88d67eac45e71556d5 100644
(file)
--- a/
src/wx/dir_picker_ctrl.cc
+++ b/
src/wx/dir_picker_ctrl.cc
@@
-53,7
+53,11
@@
DirPickerCtrl::SetPath (wxString p)
if (_path == wxStandardPaths::Get().GetDocumentsDir()) {
_folder->SetLabel (_("My Documents"));
} else {
+#if BOOST_FILESYSTEM_VERSION == 3
_folder->SetLabel (std_to_wx (filesystem::path (wx_to_std (_path)).leaf().string()));
+#else
+ _folder->SetLabel (std_to_wx (filesystem::path (wx_to_std (_path)).leaf()));
+#endif
}
}