Fix use-own-dirpicker build.

[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 ffd3b6fa115a116b63d6c352c1c7d29d2c5487b0..feb11a52702b62538d0496f84473eda5cbfb349d 100644 (file)
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -21,9 +21,13 @@
 #include "dir_picker_ctrl.h"
 #include "wx_util.h"
 #include "static_text.h"
+#include "dcpomatic_button.h"
+#include "lib/warnings.h"
 #include <wx/wx.h>
 #include <wx/stdpaths.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 using namespace std;
@@ -35,8 +39,11 @@ DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
        _sizer = new wxBoxSizer (wxHORIZONTAL);
 
        _folder = new StaticText (this, wxT(""));
-       _sizer->Add (_folder, 1, wxEXPAND | wxALL, 6);
-       _browse = new wxButton (this, wxID_ANY, _("Browse..."));
+       wxFont font = _folder->GetFont ();
+       font.SetStyle (wxFONTSTYLE_ITALIC);
+       _folder->SetFont (font);
+       _sizer->Add (_folder, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
+       _browse = new Button (this, _("Browse..."));
        _sizer->Add (_browse, 0);
 
        SetSizer (_sizer);
@@ -52,7 +59,7 @@ DirPickerCtrl::SetPath (wxString p)
        if (_path == wxStandardPaths::Get().GetDocumentsDir()) {
                _folder->SetLabel (_("My Documents"));
        } else {
-               _folder->SetLabel (std_to_wx (filesystem::path (wx_to_std (_path)).leaf().string()));
+               _folder->SetLabel (_path);
        }
 
        wxCommandEvent ev (wxEVT_DIRPICKER_CHANGED, wxID_ANY);
@@ -60,6 +67,8 @@ DirPickerCtrl::SetPath (wxString p)
 
        _sizer->Layout ();
        SetMinSize (wxSize (max (400, _sizer->GetSize().GetWidth()), -1));
+
+       Changed ();
 }
 
 wxString