X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffile_picker_ctrl.cc;h=3eb05e44dcd966226fe2d0d582e41dfabfb980cc;hb=d6f2c9547db4dbde17ae97ea37148b62a249bf63;hp=03b2880fe201d14a15fd92f6b6cae113b033fe50;hpb=ad5c8849fc3ef5aad88201f28db5474a60db4436;p=dcpomatic.git diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc index 03b2880fe..3eb05e44d 100644 --- a/src/wx/file_picker_ctrl.cc +++ b/src/wx/file_picker_ctrl.cc @@ -20,18 +20,24 @@ #include "file_picker_ctrl.h" #include "wx_util.h" +#include "dcpomatic_button.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include #include #include +DCPOMATIC_ENABLE_WARNINGS #include using namespace std; using namespace boost; -FilePickerCtrl::FilePickerCtrl (wxWindow* parent, wxString prompt, wxString wildcard) +FilePickerCtrl::FilePickerCtrl (wxWindow* parent, wxString prompt, wxString wildcard, bool open, bool warn_overwrite) : wxPanel (parent) , _prompt (prompt) , _wildcard (wildcard) + , _open (open) + , _warn_overwrite (warn_overwrite) { _sizer = new wxBoxSizer (wxHORIZONTAL); @@ -39,11 +45,10 @@ FilePickerCtrl::FilePickerCtrl (wxWindow* parent, wxString prompt, wxString wild wxSize size = dc.GetTextExtent (wxT ("This is the length of the file label it should be quite long")); size.SetHeight (-1); - _file = new wxButton (this, wxID_ANY, _("(None)"), wxDefaultPosition, size, wxBU_LEFT); + _file = new Button (this, _("(None)"), wxDefaultPosition, size, wxBU_LEFT); _sizer->Add (_file, 1, wxEXPAND, 0); SetSizerAndFit (_sizer); - _file->Bind (wxEVT_BUTTON, boost::bind (&FilePickerCtrl::browse_clicked, this)); } @@ -71,10 +76,20 @@ FilePickerCtrl::GetPath () const void FilePickerCtrl::browse_clicked () { - wxFileDialog* d = new wxFileDialog (this, _prompt, wxEmptyString, wxEmptyString, _wildcard); + long style = _open ? wxFD_OPEN : wxFD_SAVE; + if (_warn_overwrite) { + style |= wxFD_OVERWRITE_PROMPT; + } + wxFileDialog* d = new wxFileDialog (this, _prompt, wxEmptyString, wxEmptyString, _wildcard, style); d->SetPath (_path); if (d->ShowModal () == wxID_OK) { SetPath (d->GetPath ()); } d->Destroy (); } + +void +FilePickerCtrl::SetWildcard (wxString w) +{ + _wildcard = w; +}