wx printf() implementation bug fixes ('%' handling, thread safety, ...) and optimisat...

[wxWidgets.git] / include / wx / archive.h

diff --git a/include/wx/archive.h b/include/wx/archive.h
index c38ac18ce6b31e75a56efab40ed7380f50c567aa..31f6b921b1b4808939587f8f9a48c027b14b8ca0 100644 (file)
--- a/include/wx/archive.h
+++ b/include/wx/archive.h
@@ -10,10 +10,6 @@
 #ifndef _WX_ARCHIVE_H__
 #define _WX_ARCHIVE_H__
 
 #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_ARCHIVE_STREAMS
 #include "wx/defs.h"
 
 #if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS


@@ -341,6 +337,8 @@ public:
     wxMBConv& GetConv() const { return *m_pConv; }
 
 protected:
     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;
     virtual wxArchiveEntry        *DoNewEntry() const = 0;
     virtual wxArchiveInputStream  *DoNewStream(wxInputStream& stream) const = 0;
     virtual wxArchiveOutputStream *DoNewStream(wxOutputStream& stream) const = 0;