ignore warning 4535 for VC8 too as it still seems to be harmless

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

diff --git a/include/wx/archive.h b/include/wx/archive.h
index 6f0ce844e15b3ccf308786b5b9003aca98e40bc1..7acebd1e28e6be3b68a23fe0f77cb2086fa19a63 100644 (file)
--- a/include/wx/archive.h
+++ b/include/wx/archive.h
@@ -342,7 +342,8 @@ public:
         wxPathFormat format = wxPATH_NATIVE) const = 0;
 
     void SetConv(wxMBConv& conv) { m_pConv = &conv; }
         wxPathFormat format = wxPATH_NATIVE) const = 0;
 
     void SetConv(wxMBConv& conv) { m_pConv = &conv; }

-    wxMBConv& GetConv() const { return *m_pConv; }
+    wxMBConv& GetConv() const
+        { if (m_pConv) return *m_pConv; else return wxConvLocal; }

 
     static const wxArchiveClassFactory *Find(const wxChar *protocol,
                                              wxStreamProtocolType type
 
     static const wxArchiveClassFactory *Find(const wxChar *protocol,
                                              wxStreamProtocolType type


@@ -363,7 +364,7 @@ protected:
     virtual wxArchiveInputStream  *DoNewStream(wxInputStream *stream) const = 0;
     virtual wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const = 0;
 
     virtual wxArchiveInputStream  *DoNewStream(wxInputStream *stream) const = 0;
     virtual wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const = 0;
 

-    wxArchiveClassFactory() : m_pConv(&wxConvLocal), m_next(this) { }
+    wxArchiveClassFactory() : m_pConv(NULL), m_next(this) { }

     wxArchiveClassFactory& operator=(const wxArchiveClassFactory& WXUNUSED(f))
         { return *this; }
 
     wxArchiveClassFactory& operator=(const wxArchiveClassFactory& WXUNUSED(f))
         { return *this; }