Cleanup: handle Filter objects by value rather than by reference.

[dcpomatic.git] / src / wx / file_picker_ctrl.cc

diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc
index 6272a80163c6256c28f216bbc574196313bbd430..4bb6518efc2fe33a91ac26812a701a5fba9bd55e 100644 (file)
--- a/src/wx/file_picker_ctrl.cc
+++ b/src/wx/file_picker_ctrl.cc
@@ -18,20 +18,29 @@
 
 */
 
+
+#include "dcpomatic_button.h"
 #include "file_picker_ctrl.h"
 #include "wx_util.h"
-#include <wx/wx.h>
-#include <wx/stdpaths.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;
 
-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,12 +48,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
@@ -53,12 +61,12 @@ FilePickerCtrl::SetPath (wxString p)
        _path = p;
 
        if (!_path.IsEmpty ()) {
-               _file->SetLabel (std_to_wx (filesystem::path (wx_to_std (_path)).leaf().string()));
+               _file->SetLabel(std_to_wx(filesystem::path(wx_to_std(_path)).filename().string()));
        } else {
                _file->SetLabel (_("(None)"));
        }
 
-       wxCommandEvent ev (wxEVT_COMMAND_FILEPICKER_CHANGED, wxID_ANY);
+       wxCommandEvent ev (wxEVT_FILEPICKER_CHANGED, wxID_ANY);
        GetEventHandler()->ProcessEvent (ev);
 }
 
@@ -71,10 +79,19 @@ FilePickerCtrl::GetPath () const
 void
 FilePickerCtrl::browse_clicked ()
 {
-       wxFileDialog* d = new wxFileDialog (this, _prompt, wxEmptyString, wxEmptyString, _wildcard);
-       d->SetPath (_path);
-       if (d->ShowModal () == wxID_OK) {
-               SetPath (d->GetPath ());
+       long style = _open ? wxFD_OPEN : wxFD_SAVE;
+       if (_warn_overwrite) {
+               style |= wxFD_OVERWRITE_PROMPT;
+       }
+       wxFileDialog dialog(this, _prompt, wxEmptyString, wxEmptyString, _wildcard, style);
+       dialog.SetPath(_path);
+       if (dialog.ShowModal() == wxID_OK) {
+               SetPath(dialog.GetPath());
        }
-       d->Destroy ();
+}
+
+void
+FilePickerCtrl::SetWildcard (wxString w)
+{
+       _wildcard = w;
 }