*/
-#include <wx/wx.h>
-#include <wx/stdpaths.h>
-#include <wx/filepicker.h>
-#include <boost/filesystem.hpp>
+
+#include "dcpomatic_button.h"
#include "dir_picker_ctrl.h"
+#include "static_text.h"
#include "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/filepicker.h>
+#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 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);
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);
_sizer->Layout ();
SetMinSize (wxSize (max (400, _sizer->GetSize().GetWidth()), -1));
+
+ Changed ();
}
wxString
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 ();
}