undo the last change as it results in buildbot configuration error

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

diff --git a/interface/wx/zipstrm.h b/interface/wx/zipstrm.h
index d888e5cbf66940e5089b8d89ddd74b2c7891f30c..0122fff594f8d5f85217ec2c01a774f7ac7d46a9 100644 (file)
--- a/interface/wx/zipstrm.h
+++ b/interface/wx/zipstrm.h
@@ -98,7 +98,7 @@ enum wxZipFlags
     See @ref overview_archive_noseek.
 
     @library{wxbase}
     See @ref overview_archive_noseek.
 
     @library{wxbase}

-    @category{archive}
+    @category{archive,streams}

 
     @see @ref overview_archive_noseek, wxZipEntry, wxZipInputStream, wxZipOutputStream
 */
 
     @see @ref overview_archive_noseek, wxZipEntry, wxZipInputStream, wxZipOutputStream
 */


@@ -108,7 +108,7 @@ public:
     /**
         Override this to receive notifications when an wxZipEntry object changes.
     */
     /**
         Override this to receive notifications when an wxZipEntry object changes.
     */

-    void OnEntryUpdated(wxZipEntry& entry);
+    virtual void OnEntryUpdated(wxZipEntry& entry) = 0;

 };
 
 
 };
 
 


@@ -160,14 +160,16 @@ public:
     - wxZipEntry::IsText
 
     @library{wxbase}
     - wxZipEntry::IsText
 
     @library{wxbase}

-    @category{archive}
+    @category{archive,streams}

 
     @see @ref overview_archive, wxZipInputStream, wxZipOutputStream, wxZipNotifier
 */
 class wxZipEntry : public wxArchiveEntry
 {
 public:
 
     @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.
 
     /**
         Copy constructor.


@@ -212,7 +214,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.
     */
         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);
     //@}
     size_t GetExtraLen() const;
     void SetExtra(const char* extra, size_t len);
     //@}


@@ -224,7 +226,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.
     */
         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);
     //@}
     size_t GetLocalExtraLen() const;
     void SetLocalExtra(const char* extra, size_t len);
     //@}


@@ -275,7 +277,7 @@ public:
     /**
         The compressed size of this entry in bytes.
     */
     /**
         The compressed size of this entry in bytes.
     */

-    off_t GetCompressedSize() const;
+    wxFileOffset GetCompressedSize() const;

 
     /**
         CRC32 for this entry's data.
 
     /**
         CRC32 for this entry's data.


@@ -361,7 +363,7 @@ public:
     wxZipInputStream::SeekI() always returns ::wxInvalidOffset.
 
     @library{wxbase}
     wxZipInputStream::SeekI() always returns ::wxInvalidOffset.
 
     @library{wxbase}

-    @category{streams}
+    @category{archive,streams}

 
     @see @ref overview_archive, wxZipEntry, wxZipOutputStream
 */
 
     @see @ref overview_archive, wxZipEntry, wxZipOutputStream
 */


@@ -443,7 +445,7 @@ public:
     See the base class for details.
 
     @library{wxbase}
     See the base class for details.
 
     @library{wxbase}

-    @category{archive}
+    @category{archive,streams}

 
     @see @ref overview_archive,
          @ref overview_archive_generic,
 
     @see @ref overview_archive,
          @ref overview_archive_generic,


@@ -468,7 +470,7 @@ public:
     entry and begins the next.
 
     @library{wxbase}
     entry and begins the next.
 
     @library{wxbase}

-    @category{streams}
+    @category{archive,streams}

 
     @see @ref overview_archive, wxZipEntry, wxZipInputStream
 */
 
     @see @ref overview_archive, wxZipEntry, wxZipInputStream
 */


@@ -568,7 +570,7 @@ public:
     */
     bool PutNextEntry(const wxString& name,
                       const wxDateTime& dt = wxDateTime::Now(),
     */
     bool PutNextEntry(const wxString& name,
                       const wxDateTime& dt = wxDateTime::Now(),

-                      off_t size = wxInvalidOffset);
+                      wxFileOffset size = wxInvalidOffset);

     //@}
 
     /**
     //@}
 
     /**