converted to 16 colors

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

diff --git a/include/wx/zipstream.h b/include/wx/zipstream.h
index 6da057c473e06bf0cd7ed0adeeab13917b090018..ad1e680b32719d1d13ca8d7b71b889c0d52dcf0e 100644 (file)
--- a/include/wx/zipstream.h
+++ b/include/wx/zipstream.h
@@ -13,9 +13,11 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#if wxUSE_ZLIB && wxUSE_STREAMS
+#include "wx/defs.h"

 
 

-#include <wx/stream.h>
+#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB 
+
+#include "wx/stream.h"

 
 //--------------------------------------------------------------------------------
 // wxZipInputStream
 
 //--------------------------------------------------------------------------------
 // wxZipInputStream


@@ -41,16 +43,18 @@ class WXDLLEXPORT wxZipInputStream : public wxInputStream
         ~wxZipInputStream();
 
     protected:
         ~wxZipInputStream();
 
     protected:

-        virtual size_t StreamSize() const {return m_Size;}
+        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;}
 };
 
 
         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 // if use_zlib && use_streams
+#endif 
+   // wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB 

 
 

-#endif // __ZIPSTREAM_H__
+#endif 
+   // __ZIPSTREAM_H__