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

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

diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h
index b92119904f85f6eb98696797652e3a5255d611d7..58c6d9a48bd02776a3a10aad5cb5029011f8972a 100644 (file)
--- a/include/wx/tarstrm.h
+++ b/include/wx/tarstrm.h
@@ -118,11 +118,11 @@ public:
 
     void SetNotifier(wxTarNotifier& WXUNUSED(notifier)) { }
 
-private:
+protected:
     void SetOffset(wxFileOffset offset)         { m_Offset = offset; }
-
     virtual wxArchiveEntry* DoClone() const     { return Clone(); }
 
+private:
     wxString     m_Name;
     int          m_Mode;
     bool         m_IsModeSet;
@@ -161,6 +161,7 @@ public:
     virtual ~wxTarInputStream();
 
     bool OpenEntry(wxTarEntry& entry);
+    bool OpenEntry(wxArchiveEntry& entry);
     bool CloseEntry();
 
     wxTarEntry *GetNextEntry();
@@ -173,11 +174,11 @@ protected:
     wxFileOffset OnSysTell() const      { return m_pos; }
     wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
 
+    wxArchiveEntry *DoGetNextEntry()    { return GetNextEntry(); }
+
 private:
     void Init();
 
-    wxArchiveEntry *DoGetNextEntry()    { return GetNextEntry(); }
-    bool OpenEntry(wxArchiveEntry& entry);
     bool IsOpened() const               { return m_pos != wxInvalidOffset; }
 
     wxStreamError ReadHeaders();
@@ -218,6 +219,7 @@ public:
     virtual ~wxTarOutputStream();
 
     bool PutNextEntry(wxTarEntry *entry);
+    bool PutNextEntry(wxArchiveEntry *entry);
 
     bool PutNextEntry(const wxString& name,
                       const wxDateTime& dt = wxDateTime::Now(),
@@ -227,7 +229,9 @@ public:
                          const wxDateTime& dt = wxDateTime::Now());
 
     bool CopyEntry(wxTarEntry *entry, wxTarInputStream& inputStream);
+    bool CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream);
     bool CopyArchiveMetaData(wxTarInputStream& WXUNUSED(s)) { return true; }
+    bool CopyArchiveMetaData(wxArchiveInputStream& WXUNUSED(s)) { return true; }
 
     void Sync();
     bool CloseEntry();
@@ -246,9 +250,6 @@ protected:
 private:
     void Init(wxTarFormat format);
 
-    bool PutNextEntry(wxArchiveEntry *entry);
-    bool CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream);
-    bool CopyArchiveMetaData(wxArchiveInputStream& WXUNUSED(s)) { return true; }
     bool IsOpened() const               { return m_pos != wxInvalidOffset; }
 
     bool WriteHeaders(wxTarEntry& entry);