X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffile_picker_ctrl.cc;h=47b5dbca06a7e8ade9bb710d7de8076a2312c508;hb=f54283f3ad09b896e7b204b76c12e6061d0405e0;hp=6272a80163c6256c28f216bbc574196313bbd430;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc
index 6272a8016..47b5dbca0 100644
--- a/src/wx/file_picker_ctrl.cc
+++ b/src/wx/file_picker_ctrl.cc
@@ -20,6 +20,7 @@
 
 #include "file_picker_ctrl.h"
 #include "wx_util.h"
+#include "dcpomatic_button.h"
 #include <wx/wx.h>
 #include <wx/stdpaths.h>
 #include <wx/filepicker.h>
@@ -28,10 +29,11 @@
 using namespace std;
 using namespace boost;
 
-FilePickerCtrl::FilePickerCtrl (wxWindow* parent, wxString prompt, wxString wildcard)
+FilePickerCtrl::FilePickerCtrl (wxWindow* parent, wxString prompt, wxString wildcard, bool open)
 	: wxPanel (parent)
 	, _prompt (prompt)
 	, _wildcard (wildcard)
+	, _open (open)
 {
 	_sizer = new wxBoxSizer (wxHORIZONTAL);
 
@@ -39,12 +41,11 @@ 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_COMMAND_BUTTON_CLICKED, boost::bind (&FilePickerCtrl::browse_clicked, this));
+	_file->Bind (wxEVT_BUTTON, boost::bind (&FilePickerCtrl::browse_clicked, this));
 }
 
 void
@@ -58,7 +59,7 @@ FilePickerCtrl::SetPath (wxString p)
 		_file->SetLabel (_("(None)"));
 	}
 
-	wxCommandEvent ev (wxEVT_COMMAND_FILEPICKER_CHANGED, wxID_ANY);
+	wxCommandEvent ev (wxEVT_FILEPICKER_CHANGED, wxID_ANY);
 	GetEventHandler()->ProcessEvent (ev);
 }
 
@@ -71,10 +72,16 @@ FilePickerCtrl::GetPath () const
 void
 FilePickerCtrl::browse_clicked ()
 {
-	wxFileDialog* d = new wxFileDialog (this, _prompt, wxEmptyString, wxEmptyString, _wildcard);
+	wxFileDialog* d = new wxFileDialog (this, _prompt, wxEmptyString, wxEmptyString, _wildcard, _open ? wxFD_OPEN : wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
 	d->SetPath (_path);
 	if (d->ShowModal () == wxID_OK) {
 		SetPath (d->GetPath ());
 	}
 	d->Destroy ();
 }
+
+void
+FilePickerCtrl::SetWildcard (wxString w)
+{
+	_wildcard = w;
+}