fixing xti problems

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

diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index 1c4be2784584837710d3364f16d1f6b5ade1447e..b8a098c0e0c5ee8b9933a407237d504c8596cbe0 100644 (file)
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -9,7 +9,7 @@
 #ifndef __ZIPSTREAM_H__
 #define __ZIPSTREAM_H__
 
 #ifndef __ZIPSTREAM_H__
 #define __ZIPSTREAM_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "zipstrm.h"
 #endif
 
 #pragma interface "zipstrm.h"
 #endif
 


@@ -26,49 +26,36 @@
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------
 
 

-class WXDLLEXPORT wxZipInputStream : public wxInputStream
+class WXDLLIMPEXP_BASE wxZipInputStream : public wxInputStream

 {
 {

-    private:
-        size_t m_Size;
-        off_t m_Pos;
-        void *m_Archive;
-                // 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.
-
-    public:
-        wxZipInputStream(const wxString& archive, const wxString& file);
-                // archive is name of .zip archive, file is name of file to be extracted.
-                // Remember that archive must be local file accesible via fopen, fread functions!
-        ~wxZipInputStream();
-
-    protected:
-        virtual size_t GetSize() const {return m_Size;}
-        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;}
-};
-
-
-#endif 
-   // wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB 
-
-#endif 
-   // __ZIPSTREAM_H__
-
-
-
-
-
-
-
-
-
+public:
+    wxZipInputStream(const wxString& archive, const wxString& file);
+            // archive is name of .zip archive, file is name of file to be extracted.
+            // Remember that archive must be local file accesible via fopen, fread functions!
+    ~wxZipInputStream();

 
 

+    virtual size_t GetSize() const {return m_Size;}
+    virtual bool Eof() const;

 
 

+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;}

 
 

+private:
+    size_t m_Size;
+    off_t 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 
+   // __ZIPSTREAM_H__