X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..1e151594721201f2048aa295dcf35acd28f012b9:/include/wx/zipstrm.h?ds=sidebyside

diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index 4b8b4cf346..489a73020d 100644
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -3,19 +3,19 @@
 // Purpose:     wxZipInputStream for reading files from ZIP archive
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __ZIPSTREAM_H__
 #define __ZIPSTREAM_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "zipstrm.h"
 #endif
 
 #include "wx/defs.h"
 
-#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB 
+#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
 
 #include "wx/stream.h"
 
@@ -26,7 +26,7 @@
 //--------------------------------------------------------------------------------
 
 
-class WXDLLEXPORT wxZipInputStream : public wxInputStream
+class WXDLLIMPEXP_BASE wxZipInputStream : public wxInputStream
 {
 public:
     wxZipInputStream(const wxString& archive, const wxString& file);
@@ -39,21 +39,23 @@ public:
 
 protected:
     virtual size_t OnSysRead(void *buffer, size_t bufsize);
-    virtual off_t OnSysSeek(off_t seek, wxSeekMode mode);
-    virtual off_t OnSysTell() const {return m_Pos;}
+    virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
+    virtual wxFileOffset OnSysTell() const {return m_Pos;}
 
 private:
     size_t m_Size;
-    off_t m_Pos;
+    wxFileOffset m_Pos;
 
     // this void* is handle of archive . I'm sorry it is void and not proper
     // type but I don't want to make unzip.h header public.
     void *m_Archive;
+
+    DECLARE_NO_COPY_CLASS(wxZipInputStream)
 };
 
 
-#endif 
-   // wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB 
+#endif
+   // wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
 
-#endif 
+#endif
    // __ZIPSTREAM_H__