Actually remove deps folder.

[dcpomatic.git] / src / wx / dir_picker_ctrl.cc

diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index 4cd7c3d155e5586f091d538df9f1d4ca5596a26e..cb811fc1087a26839832a5b73f1bdb735d1d0ba3 100644 (file)
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -40,9 +40,6 @@ DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
        SetSizerAndFit (_sizer);
 
        _browse->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (DirPickerCtrl::browse_clicked), 0, this);
-
-       /* Do this after the fit so that our folder label stays long */
-       SetPath (wxStandardPaths::Get().GetDocumentsDir());
 }
 
 void
@@ -53,7 +50,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         
        }
 }