From e9527ee5a2019b2ddc737d9dcf2a49f7f707013b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 8 Apr 2023 23:03:24 +0100
Subject: [PATCH] Define wxArchiveIterator in all builds, not just STL one

Doing this doesn't introduce any backwards compatibility problems, so do
it always, and not only when wxUSE_STL==1.
---
 include/wx/archive.h        | 5 -----
 include/wx/tarstrm.h        | 4 ----
 include/wx/zipstrm.h        | 4 ----
 interface/wx/archive.h      | 4 +---
 tests/archive/archivetest.h | 2 --
 5 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/include/wx/archive.h b/include/wx/archive.h
index f7ef8e08ac..799de98d02 100644
--- a/include/wx/archive.h
+++ b/include/wx/archive.h
@@ -164,7 +164,6 @@ private:
 // An input iterator that can be used to transfer an archive's catalog to
 // a container.
 
-#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
 #include <iterator>
 #include <utility>
 
@@ -296,8 +295,6 @@ typedef wxArchiveIterator<wxArchiveInputStream> wxArchiveIter;
 typedef wxArchiveIterator<wxArchiveInputStream,
         std::pair<wxString, wxArchiveEntry*> >  wxArchivePairIter;
 
-#endif // wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
-
 
 /////////////////////////////////////////////////////////////////////////////
 // wxArchiveClassFactory
@@ -314,10 +311,8 @@ public:
     typedef wxArchiveInputStream  instream_type;
     typedef wxArchiveOutputStream outstream_type;
     typedef wxArchiveNotifier     notifier_type;
-#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
     typedef wxArchiveIter         iter_type;
     typedef wxArchivePairIter     pairiter_type;
-#endif
 
     virtual ~wxArchiveClassFactory() { }
 
diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h
index bddc2df6d2..8c97475573 100644
--- a/include/wx/tarstrm.h
+++ b/include/wx/tarstrm.h
@@ -289,11 +289,9 @@ private:
 /////////////////////////////////////////////////////////////////////////////
 // Iterators
 
-#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
 typedef wxArchiveIterator<wxTarInputStream> wxTarIter;
 typedef wxArchiveIterator<wxTarInputStream,
          std::pair<wxString, wxTarEntry*> > wxTarPairIter;
-#endif
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -306,10 +304,8 @@ public:
     typedef wxTarInputStream  instream_type;
     typedef wxTarOutputStream outstream_type;
     typedef wxTarNotifier     notifier_type;
-#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
     typedef wxTarIter         iter_type;
     typedef wxTarPairIter     pairiter_type;
-#endif
 
     wxTarClassFactory();
 
diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index d5c34e6c43..584c3ac95c 100644
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -458,11 +458,9 @@ private:
 /////////////////////////////////////////////////////////////////////////////
 // Iterators
 
-#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
 typedef wxArchiveIterator<wxZipInputStream> wxZipIter;
 typedef wxArchiveIterator<wxZipInputStream,
          std::pair<wxString, wxZipEntry*> > wxZipPairIter;
-#endif
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -475,10 +473,8 @@ public:
     typedef wxZipInputStream  instream_type;
     typedef wxZipOutputStream outstream_type;
     typedef wxZipNotifier     notifier_type;
-#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
     typedef wxZipIter         iter_type;
     typedef wxZipPairIter     pairiter_type;
-#endif
 
     wxZipClassFactory();
 
diff --git a/interface/wx/archive.h b/interface/wx/archive.h
index 37d7f208de..d6a50ed53c 100644
--- a/interface/wx/archive.h
+++ b/interface/wx/archive.h
@@ -497,9 +497,7 @@ public:
     @class wxArchiveIterator
 
     An input iterator template class that can be used to transfer an archive's
-    catalogue to a container. It is only available if wxUSE_STL is set to 1
-    in setup.h, and the uses for it outlined below require a compiler which
-    supports member templates.
+    catalogue to a container.
 
     @code
     template<class Arc, class T = typename Arc::entry_type*>
diff --git a/tests/archive/archivetest.h b/tests/archive/archivetest.h
index 986aae64e5..565c4f6cdf 100644
--- a/tests/archive/archivetest.h
+++ b/tests/archive/archivetest.h
@@ -9,8 +9,6 @@
 #ifndef WX_ARCHIVETEST_INCLUDED
 #define WX_ARCHIVETEST_INCLUDED 1
 
-#define WX_TEST_ARCHIVE_ITERATOR
-
 #include "wx/archive.h"
 #include "wx/wfstream.h"