diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-10-17 19:47:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-10-17 19:47:54 +0100 |
| commit | 08d14b3aac137152a3aeb58c170b1b69bd0dd9eb (patch) | |
| tree | e77c65084e72290f77d5346e4020d3357403c018 /src | |
| parent | 3c74b178eeea8418f044877f88e94003605497b6 (diff) | |
Revert "Remove wxWidgets' file overwrite checks in favour of our own (because of #1383)."
This reverts commit 3c74b178eeea8418f044877f88e94003605497b6.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/config_dialog.cc | 15 | ||||
| -rw-r--r-- | src/wx/full_config_dialog.cc | 3 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 2f396ded0..e55de008f 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -515,7 +515,8 @@ CertificateChainEditor::export_certificate () } wxFileDialog* d = new wxFileDialog ( - this, _("Select Certificate File"), wxEmptyString, wxEmptyString, wxT ("PEM files (*.pem)|*.pem"), wxFD_SAVE + this, _("Select Certificate File"), wxEmptyString, wxEmptyString, wxT ("PEM files (*.pem)|*.pem"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); dcp::CertificateChain::List all = _get()->root_to_leaf (); @@ -695,7 +696,8 @@ CertificateChainEditor::export_private_key () } wxFileDialog* d = new wxFileDialog ( - this, _("Select Key File"), wxEmptyString, wxEmptyString, wxT ("PEM files (*.pem)|*.pem"), wxFD_SAVE + this, _("Select Key File"), wxEmptyString, wxEmptyString, wxT ("PEM files (*.pem)|*.pem"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); if (d->ShowModal () == wxID_OK) { @@ -792,7 +794,8 @@ void KeysPage::export_decryption_chain_and_key () { wxFileDialog* d = new wxFileDialog ( - _panel, _("Select Export File"), wxEmptyString, wxEmptyString, wxT ("DOM files (*.dom)|*.dom"), wxFD_SAVE + _panel, _("Select Export File"), wxEmptyString, wxEmptyString, wxT ("DOM files (*.dom)|*.dom"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); if (d->ShowModal () == wxID_OK) { @@ -871,7 +874,8 @@ void KeysPage::export_decryption_chain () { wxFileDialog* d = new wxFileDialog ( - _panel, _("Select Chain File"), wxEmptyString, _("dcpomatic_kdm_decryption_chain.pem"), wxT ("PEM files (*.pem)|*.pem"), wxFD_SAVE + _panel, _("Select Chain File"), wxEmptyString, _("dcpomatic_kdm_decryption_chain.pem"), wxT ("PEM files (*.pem)|*.pem"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); if (d->ShowModal () == wxID_OK) { @@ -894,7 +898,8 @@ void KeysPage::export_decryption_certificate () { wxFileDialog* d = new wxFileDialog ( - _panel, _("Select Certificate File"), wxEmptyString, _("dcpomatic_kdm_decryption_cert.pem"), wxT ("PEM files (*.pem)|*.pem"), wxFD_SAVE + _panel, _("Select Certificate File"), wxEmptyString, _("dcpomatic_kdm_decryption_cert.pem"), wxT ("PEM files (*.pem)|*.pem"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); if (d->ShowModal () == wxID_OK) { diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 8c822e173..974635a8b 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -191,7 +191,8 @@ private: void export_cinemas_file () { wxFileDialog* d = new wxFileDialog ( - _panel, _("Select Cinemas File"), wxEmptyString, wxEmptyString, wxT ("XML files (*.xml)|*.xml"), wxFD_SAVE + _panel, _("Select Cinemas File"), wxEmptyString, wxEmptyString, wxT ("XML files (*.xml)|*.xml"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); if (d->ShowModal () == wxID_OK) { |