Typecast during compilation instead of class constructor call (OW warnig fix).

[wxWidgets.git] / src / common / zipstrm.cpp

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index c6b966fa30201152eee8ed08005d2524a2a1390e..c73a2aebd27a68c53aaca9c9061f05b00d405cb1 100644 (file)
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -146,7 +146,7 @@ public:
     void Close() { m_pos = 0; m_lasterror = wxSTREAM_NO_ERROR; }
 
     virtual char Peek() { return wxInputStream::Peek(); }
-    virtual size_t GetSize() const { return m_len; }
+    virtual wxFileOffset GetLength() const { return m_len; }
 
 protected:
     virtual size_t OnSysRead(void *buffer, size_t size);
@@ -1751,7 +1751,7 @@ wxFileOffset wxZipInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
     {
         case wxFromCurrent : nextpos = seek + pos; break;
         case wxFromStart : nextpos = seek; break;
-        case wxFromEnd : nextpos = GetSize() - 1 + seek; break;
+        case wxFromEnd : nextpos = GetLength() - 1 + seek; break;
         default : nextpos = pos; break; /* just to fool compiler, never happens */
     }
 
@@ -1793,7 +1793,7 @@ wxFileOffset wxZipInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
 /////////////////////////////////////////////////////////////////////////////
 // Output stream
 
-#include <wx/listimpl.cpp>
+#include "wx/listimpl.cpp"
 WX_DEFINE_LIST(_wxZipEntryList);
 
 wxZipOutputStream::wxZipOutputStream(wxOutputStream& stream,