added wxMenu::AppendSubMenu() to avoid having to specify a dummy id when adding a...

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

diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index c2963a9e6b8e3deb3bca54c467f65e163fc451ed..3dbab08dc040fc7bca3ca20ff185ac1d954350dd 100644 (file)
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -222,9 +222,9 @@ protected:
 
     void Notify();
 
-private:
     wxArchiveEntry* DoClone() const             { return ZipClone(); }
 
+private:
     size_t ReadLocal(wxInputStream& stream, wxMBConv& conv);
     size_t WriteLocal(wxOutputStream& stream, wxMBConv& conv) const;
 
@@ -300,7 +300,11 @@ public:
 
     int  GetLevel() const                       { return m_level; }
     void WXZIPFIX SetLevel(int level);
-    
+
+    bool WXZIPFIX PutNextEntry(wxArchiveEntry *entry);
+    bool WXZIPFIX CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream);
+    bool WXZIPFIX CopyArchiveMetaData(wxArchiveInputStream& stream);
+
 protected:
     virtual size_t WXZIPFIX OnSysWrite(const void *buffer, size_t size);
     virtual wxFileOffset OnSysTell() const      { return m_entrySize; }
@@ -316,10 +320,6 @@ protected:
         { return m_offsetAdjustment != wxInvalidOffset; }
 
 private:
-    bool WXZIPFIX PutNextEntry(wxArchiveEntry *entry);
-    bool WXZIPFIX CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream);
-    bool WXZIPFIX CopyArchiveMetaData(wxArchiveInputStream& stream);
-
     bool IsOpened() const { return m_comp || m_pending; }
 
     bool DoCreate(wxZipEntry *entry, bool raw = false);
@@ -364,6 +364,7 @@ public:
 
     virtual WXZIPFIX ~wxZipInputStream();
 
+    bool WXZIPFIX OpenEntry(wxArchiveEntry& entry);
     bool OpenEntry(wxZipEntry& entry)   { return DoOpen(&entry); }
     bool WXZIPFIX CloseEntry();
 
@@ -386,15 +387,13 @@ protected:
     virtual wxInputStream* WXZIPFIX OpenDecompressor(wxInputStream& stream);
     virtual bool WXZIPFIX CloseDecompressor(wxInputStream *decomp);
 
+    wxArchiveEntry *DoGetNextEntry()    { return GetNextEntry(); }
+
 private:
     void Init();
     void Init(const wxString& file);
     wxInputStream& OpenFile(const wxString& archive);
 
-    wxArchiveEntry *DoGetNextEntry()    { return GetNextEntry(); }
-
-    bool WXZIPFIX OpenEntry(wxArchiveEntry& entry);
-
     wxStreamError ReadLocal(bool readEndRec = false);
     wxStreamError ReadCentral();