Emit no audio from DCPs if none is mapped

[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 289316820a3aa8bd2d806220b85546fcdff7297f..4c19da42af60662672c31d68536227e53c5ef74b 100644 (file)
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -18,28 +18,34 @@
 
 */
 
+
+#include "dcpomatic_button.h"
 #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_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/stdpaths.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
+
 using namespace std;
 using namespace boost;
 
+
 DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
        : wxPanel (parent)
 {
        _sizer = new wxBoxSizer (wxHORIZONTAL);
 
        _folder = new StaticText (this, wxT(""));
-       _sizer->Add (_folder, 1, wxEXPAND | wxALL, 6);
+       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);
 
@@ -56,7 +62,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);
@@ -64,6 +70,8 @@ DirPickerCtrl::SetPath (wxString p)
 
        _sizer->Layout ();
        SetMinSize (wxSize (max (400, _sizer->GetSize().GetWidth()), -1));
+
+       Changed ();
 }
 
 wxString
@@ -75,9 +83,8 @@ DirPickerCtrl::GetPath () const
 void
 DirPickerCtrl::browse_clicked ()
 {
-       wxDirDialog* d = new wxDirDialog (this);
+       auto d = make_wx<wxDirDialog>(this);
        if (d->ShowModal () == wxID_OK) {
                SetPath (d->GetPath ());
        }
-       d->Destroy ();
 }