From 3c74b178eeea8418f044877f88e94003605497b6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Oct 2018 19:46:18 +0100 Subject: [PATCH] Remove wxWidgets' file overwrite checks in favour of our own (because of #1383). --- src/wx/config_dialog.cc | 15 +++++---------- src/wx/full_config_dialog.cc | 3 +-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index e55de008f..2f396ded0 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -515,8 +515,7 @@ CertificateChainEditor::export_certificate () } wxFileDialog* d = new wxFileDialog ( - this, _("Select Certificate File"), wxEmptyString, wxEmptyString, wxT ("PEM files (*.pem)|*.pem"), - wxFD_SAVE | wxFD_OVERWRITE_PROMPT + this, _("Select Certificate File"), wxEmptyString, wxEmptyString, wxT ("PEM files (*.pem)|*.pem"), wxFD_SAVE ); dcp::CertificateChain::List all = _get()->root_to_leaf (); @@ -696,8 +695,7 @@ CertificateChainEditor::export_private_key () } wxFileDialog* d = new wxFileDialog ( - this, _("Select Key File"), wxEmptyString, wxEmptyString, wxT ("PEM files (*.pem)|*.pem"), - wxFD_SAVE | wxFD_OVERWRITE_PROMPT + this, _("Select Key File"), wxEmptyString, wxEmptyString, wxT ("PEM files (*.pem)|*.pem"), wxFD_SAVE ); if (d->ShowModal () == wxID_OK) { @@ -794,8 +792,7 @@ void KeysPage::export_decryption_chain_and_key () { wxFileDialog* d = new wxFileDialog ( - _panel, _("Select Export File"), wxEmptyString, wxEmptyString, wxT ("DOM files (*.dom)|*.dom"), - wxFD_SAVE | wxFD_OVERWRITE_PROMPT + _panel, _("Select Export File"), wxEmptyString, wxEmptyString, wxT ("DOM files (*.dom)|*.dom"), wxFD_SAVE ); if (d->ShowModal () == wxID_OK) { @@ -874,8 +871,7 @@ 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 | wxFD_OVERWRITE_PROMPT + _panel, _("Select Chain File"), wxEmptyString, _("dcpomatic_kdm_decryption_chain.pem"), wxT ("PEM files (*.pem)|*.pem"), wxFD_SAVE ); if (d->ShowModal () == wxID_OK) { @@ -898,8 +894,7 @@ 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 | wxFD_OVERWRITE_PROMPT + _panel, _("Select Certificate File"), wxEmptyString, _("dcpomatic_kdm_decryption_cert.pem"), wxT ("PEM files (*.pem)|*.pem"), wxFD_SAVE ); if (d->ShowModal () == wxID_OK) { diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 974635a8b..8c822e173 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -191,8 +191,7 @@ private: void export_cinemas_file () { wxFileDialog* d = new wxFileDialog ( - _panel, _("Select Cinemas File"), wxEmptyString, wxEmptyString, wxT ("XML files (*.xml)|*.xml"), - wxFD_SAVE | wxFD_OVERWRITE_PROMPT + _panel, _("Select Cinemas File"), wxEmptyString, wxEmptyString, wxT ("XML files (*.xml)|*.xml"), wxFD_SAVE ); if (d->ShowModal () == wxID_OK) { -- 2.30.2