reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index ad1e680b32719d1d13ca8d7b71b889c0d52dcf0e..4b8b4cf34687e6cb81c84ee361c9347644f90ffe 100644 (file)
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -10,7 +10,7 @@
 #define __ZIPSTREAM_H__
 
 #ifdef __GNUG__
 #define __ZIPSTREAM_H__
 
 #ifdef __GNUG__

-#pragma interface
+#pragma interface "zipstrm.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -28,25 +28,27 @@
 
 class WXDLLEXPORT wxZipInputStream : public wxInputStream
 {
 
 class WXDLLEXPORT 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;}
+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;

 };
 
 
 };
 
 


@@ -55,20 +57,3 @@ class WXDLLEXPORT wxZipInputStream : public wxInputStream
 
 #endif 
    // __ZIPSTREAM_H__
 
 #endif 
    // __ZIPSTREAM_H__

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-