don't pass NULL pointer to printf(), this crashes Solaris printf

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

diff --git a/include/wx/archive.h b/include/wx/archive.h
index aee02d5bee1cc078ccffbbe6a8cc0f9c4ed5dea3..574f8bf659ade90bf41bdf5e46dac6624fc74fd0 100644 (file)
--- a/include/wx/archive.h
+++ b/include/wx/archive.h
@@ -16,7 +16,7 @@
 
 #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 +341,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 +357,6 @@ private:
     DECLARE_ABSTRACT_CLASS(wxArchiveClassFactory)
 };
 
-#endif // wxUSE_STREAMS && wxUSE_ARCSTREAM
+#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
 
 #endif // _WX_ARCHIVE_H__