Revert "Remove wxWidgets' file overwrite checks in favour of our own (because of...

This reverts commit 3c74b178eeea8418f044877f88e94003605497b6.

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 2f396ded0e969cb3675ac50ace51066675a936b8..e55de008fb91b86ad2cf4742590a3a63820787ff 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -515,7 +515,8 @@ CertificateChainEditor::export_certificate ()
        }
 
        wxFileDialog* d = new wxFileDialog (
        }
 
        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 ();
                );
 
        dcp::CertificateChain::List all = _get()->root_to_leaf ();


@@ -695,7 +696,8 @@ CertificateChainEditor::export_private_key ()
        }
 
        wxFileDialog* d = new wxFileDialog (
        }
 
        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) {
                );
 
        if (d->ShowModal () == wxID_OK) {


@@ -792,7 +794,8 @@ void
 KeysPage::export_decryption_chain_and_key ()
 {
        wxFileDialog* d = new wxFileDialog (
 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) {
                );
 
        if (d->ShowModal () == wxID_OK) {


@@ -871,7 +874,8 @@ void
 KeysPage::export_decryption_chain ()
 {
        wxFileDialog* d = new wxFileDialog (
 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) {
                );
 
        if (d->ShowModal () == wxID_OK) {


@@ -894,7 +898,8 @@ void
 KeysPage::export_decryption_certificate ()
 {
        wxFileDialog* d = new wxFileDialog (
 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) {
                );
 
        if (d->ShowModal () == wxID_OK) {

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 8c822e1736d77d27e873fb5fb4c4d32f5b358955..974635a8b407f6f6cd0ee2096740a55a0b420e8d 100644 (file)
--- 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 (
        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) {
                 );
 
                if (d->ShowModal () == wxID_OK) {