X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81f90336020eab200e8f09a6b726c7ec49439b68..8c94336825149d5f329eaea77ba32ae5b5fd3a31:/include/wx/archive.h diff --git a/include/wx/archive.h b/include/wx/archive.h index aee02d5bee..31f6b921b1 100644 --- a/include/wx/archive.h +++ b/include/wx/archive.h @@ -10,13 +10,9 @@ #ifndef _WX_ARCHIVE_H__ #define _WX_ARCHIVE_H__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "archive.h" -#endif - #include "wx/defs.h" -#if wxUSE_STREAMS && wxUSE_ARCSTREAM +#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS #include "wx/stream.h" #include "wx/filename.h" @@ -341,6 +337,8 @@ public: wxMBConv& GetConv() const { return *m_pConv; } protected: + // old compilers don't support covarient returns, so 'Do' methods are + // used to simulate them virtual wxArchiveEntry *DoNewEntry() const = 0; virtual wxArchiveInputStream *DoNewStream(wxInputStream& stream) const = 0; virtual wxArchiveOutputStream *DoNewStream(wxOutputStream& stream) const = 0; @@ -355,6 +353,6 @@ private: DECLARE_ABSTRACT_CLASS(wxArchiveClassFactory) }; -#endif // wxUSE_STREAMS && wxUSE_ARCSTREAM +#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS #endif // _WX_ARCHIVE_H__