X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7d0a28b01dc602e3b51dcc7d9046fad2da894f9..9e9574fe45b176ee74bba8fad7574cf9906145d1:/interface/wx/zipstrm.h?ds=sidebyside

diff --git a/interface/wx/zipstrm.h b/interface/wx/zipstrm.h
index 357b113320..114469434c 100644
--- a/interface/wx/zipstrm.h
+++ b/interface/wx/zipstrm.h
@@ -2,8 +2,7 @@
 // Name:        zipstrm.h
 // Purpose:     interface of wxZipNotifier
 // Author:      wxWidgets team
-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -98,7 +97,7 @@ enum wxZipFlags
     See @ref overview_archive_noseek.
 
     @library{wxbase}
-    @category{archive}
+    @category{archive,streams}
 
     @see @ref overview_archive_noseek, wxZipEntry, wxZipInputStream, wxZipOutputStream
 */
@@ -108,7 +107,7 @@ public:
     /**
         Override this to receive notifications when an wxZipEntry object changes.
     */
-    void OnEntryUpdated(wxZipEntry& entry);
+    virtual void OnEntryUpdated(wxZipEntry& entry) = 0;
 };
 
 
@@ -160,14 +159,16 @@ public:
     - wxZipEntry::IsText
 
     @library{wxbase}
-    @category{archive}
+    @category{archive,streams}
 
     @see @ref overview_archive, wxZipInputStream, wxZipOutputStream, wxZipNotifier
 */
 class wxZipEntry : public wxArchiveEntry
 {
 public:
-    wxZipEntry(const wxString& name = wxEmptyString);
+    wxZipEntry(const wxString& name = wxEmptyString,
+               const wxDateTime& dt = Now(),
+               wxFileOffset size = wxInvalidOffset);
 
     /**
         Copy constructor.
@@ -212,7 +213,7 @@ public:
         The extra field is used to store platform or application specific
         data. See Pkware's document 'appnote.txt' for information on its format.
     */
-    char* GetExtra() const;
+    const char* GetExtra() const;
     size_t GetExtraLen() const;
     void SetExtra(const char* extra, size_t len);
     //@}
@@ -224,7 +225,7 @@ public:
         The extra field is used to store platform or application specific
         data. See Pkware's document 'appnote.txt' for information on its format.
     */
-    char* GetLocalExtra() const;
+    const char* GetLocalExtra() const;
     size_t GetLocalExtraLen() const;
     void SetLocalExtra(const char* extra, size_t len);
     //@}
@@ -275,7 +276,7 @@ public:
     /**
         The compressed size of this entry in bytes.
     */
-    off_t GetCompressedSize() const;
+    wxFileOffset GetCompressedSize() const;
 
     /**
         CRC32 for this entry's data.
@@ -361,7 +362,7 @@ public:
     wxZipInputStream::SeekI() always returns ::wxInvalidOffset.
 
     @library{wxbase}
-    @category{streams}
+    @category{archive,streams}
 
     @see @ref overview_archive, wxZipEntry, wxZipOutputStream
 */
@@ -443,7 +444,7 @@ public:
     See the base class for details.
 
     @library{wxbase}
-    @category{archive}
+    @category{archive,streams}
 
     @see @ref overview_archive,
          @ref overview_archive_generic,
@@ -468,7 +469,7 @@ public:
     entry and begins the next.
 
     @library{wxbase}
-    @category{streams}
+    @category{archive,streams}
 
     @see @ref overview_archive, wxZipEntry, wxZipInputStream
 */
@@ -499,7 +500,7 @@ public:
         The destructor calls Close() to finish writing the zip if it has
         not been called already.
     */
-    ~wxZipOutputStream();
+    virtual ~wxZipOutputStream();
 
     /**
         Finishes writing the zip, returning @true if successful.
@@ -568,7 +569,7 @@ public:
     */
     bool PutNextEntry(const wxString& name,
                       const wxDateTime& dt = wxDateTime::Now(),
-                      off_t size = wxInvalidOffset);
+                      wxFileOffset size = wxInvalidOffset);
     //@}
 
     /**