X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdir_picker_ctrl.cc;h=0a7b7a943d85f69f9d5e6f304fdbba1ed001d537;hb=6693132ed6fb863fdff496f42028d25f55eb8bc4;hp=18d3ac6f42ae89c708acc847978538ed25b7861c;hpb=be204493844d5316ff93d25a07c0f40944a78c5d;p=dcpomatic.git

diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index 18d3ac6f4..0a7b7a943 100644
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -18,12 +18,17 @@
 
 */
 
+#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>
-#include "dir_picker_ctrl.h"
-#include "wx_util.h"
 
 using namespace std;
 using namespace boost;
@@ -33,14 +38,17 @@ DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
 {
 	_sizer = new wxBoxSizer (wxHORIZONTAL);
 
-	_folder = new wxStaticText (this, wxID_ANY, wxT (""));
-	_sizer->Add (_folder, 1, wxEXPAND | wxALL, 6);
-	_browse = new wxButton (this, wxID_ANY, _("Browse..."));
+	_folder = new StaticText (this, wxT(""));
+	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);
 
-	_browse->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DirPickerCtrl::browse_clicked, this));
+	_browse->Bind (wxEVT_BUTTON, boost::bind (&DirPickerCtrl::browse_clicked, this));
 }
 
 void
@@ -51,10 +59,10 @@ 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_COMMAND_DIRPICKER_CHANGED, wxID_ANY);
+	wxCommandEvent ev (wxEVT_DIRPICKER_CHANGED, wxID_ANY);
 	GetEventHandler()->ProcessEvent (ev);
 
 	_sizer->Layout ();