From f0684510f059f7839cf57aa5cd46249b5591ed07 Mon Sep 17 00:00:00 2001
From: Ian McInerney <ian.s.mcinerney@ieee.org>
Date: Wed, 12 Apr 2023 17:14:45 +0100
Subject: [PATCH] Replace wxScopedPtr with std::unique_ptr

Upstream has deprecated wxScopedPtr and recommends users switch to using
std::unique_ptr instead.
---
 common/project/project_archiver.cpp        | 3 ++-
 include/validators.h                       | 4 +++-
 include/widgets/grid_text_button_helpers.h | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/project/project_archiver.cpp b/common/project/project_archiver.cpp
index 9405d5d340..044906d349 100644
--- a/common/project/project_archiver.cpp
+++ b/common/project/project_archiver.cpp
@@ -17,6 +17,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <memory>
 #include <wx/dir.h>
 #include <wx/filedlg.h>
 #include <wx/fs_zip.h>
@@ -62,7 +63,7 @@ bool PROJECT_ARCHIVER::Unarchive( const wxString& aSrcFile, const wxString& aDes
         return false;
     }
 
-    wxScopedPtr<wxArchiveInputStream> archiveStream( archiveClassFactory->NewStream( stream ) );
+    std::unique_ptr<wxArchiveInputStream> archiveStream( archiveClassFactory->NewStream( stream ) );
 
     wxString fileStatus;
 
diff --git a/include/validators.h b/include/validators.h
index 449e0643b8..4dcaa0c523 100644
--- a/include/validators.h
+++ b/include/validators.h
@@ -31,6 +31,8 @@
 #ifndef VALIDATORS_H
 #define VALIDATORS_H
 
+#include <memory>
+
 #include <wx/valtext.h>
 #include <wx/grid.h>
 #include <wx/regex.h>
@@ -50,7 +52,7 @@ public:
     virtual void StartingKey( wxKeyEvent& event ) override;
 
 protected:
-    wxScopedPtr<wxValidator> m_validator;
+    std::unique_ptr<wxValidator> m_validator;
 };
 
 
diff --git a/include/widgets/grid_text_button_helpers.h b/include/widgets/grid_text_button_helpers.h
index 3ffefcf725..9ed00b2f01 100644
--- a/include/widgets/grid_text_button_helpers.h
+++ b/include/widgets/grid_text_button_helpers.h
@@ -25,6 +25,8 @@
 #ifndef GRID_TEXT_BUTTON_HELPERS_H
 #define GRID_TEXT_BUTTON_HELPERS_H
 
+#include <memory>
+
 #include <wx/combo.h>
 #include <wx/generic/gridctrl.h>
 #include <wx/generic/grideditors.h>
@@ -58,7 +60,7 @@ protected:
     wxComboCtrl* Combo() const { return static_cast<wxComboCtrl*>( m_control ); }
 
 #if wxUSE_VALIDATORS
-    wxScopedPtr< wxValidator > m_validator;
+    std::unique_ptr< wxValidator > m_validator;
 #endif
 
     wxString     m_value;