even more interface fixes

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

diff --git a/interface/wx/zipstrm.h b/interface/wx/zipstrm.h
index 357b113320c2eb8727331ca84b1d7118de8f5ba8..705a570e45fb69cbc5d9e0542a0dee2a84609313 100644 (file)
--- a/interface/wx/zipstrm.h
+++ b/interface/wx/zipstrm.h
@@ -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;

 };
 
 
 };
 
 


@@ -167,7 +167,9 @@ public:
 class wxZipEntry : public wxArchiveEntry
 {
 public:
 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.


@@ -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.


@@ -499,7 +501,7 @@ public:
         The destructor calls Close() to finish writing the zip if it has
         not been called already.
     */
         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.
 
     /**
         Finishes writing the zip, returning @true if successful.


@@ -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);

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