Fix failure to reset state to "to fit DCP" properly (#2081).

[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 47b5dbca06a7e8ade9bb710d7de8076a2312c508..3eb05e44dcd966226fe2d0d582e41dfabfb980cc 100644 (file)
--- a/src/wx/file_picker_ctrl.cc
+++ b/src/wx/file_picker_ctrl.cc
@@ -21,19 +21,23 @@
 #include "file_picker_ctrl.h"
 #include "wx_util.h"
 #include "dcpomatic_button.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/stdpaths.h>
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 using namespace std;
 using namespace boost;
 
-FilePickerCtrl::FilePickerCtrl (wxWindow* parent, wxString prompt, wxString wildcard, bool open)
+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);
 
@@ -72,7 +76,11 @@ FilePickerCtrl::GetPath () const
 void
 FilePickerCtrl::browse_clicked ()
 {
-       wxFileDialog* d = new wxFileDialog (this, _prompt, wxEmptyString, wxEmptyString, _wildcard, _open ? wxFD_OPEN : wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+       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 ());