X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03c0fc660317ee8ddbd80c5f2564bce68c0d9593..c2a331e02732bb6a04a42ebf646d54b4373ad122:/src/common/zipstrm.cpp

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 9fbff10320..6a7ebb12cc 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -6,7 +6,7 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "zipstrm.h"
 #endif
 
@@ -43,12 +43,12 @@ wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file
     m_Archive = (void*) unzOpen(archive.mb_str());
     if (m_Archive == NULL)
     {
-        m_lasterror = wxStream_READ_ERR;
+        m_lasterror = wxSTREAM_READ_ERROR;
         return;
     }
     if (unzLocateFile((unzFile)m_Archive, file.mb_str(), 0) != UNZ_OK)
     {
-        m_lasterror = wxStream_READ_ERR;
+        m_lasterror = wxSTREAM_READ_ERROR;
         return;
     }
 
@@ -56,7 +56,7 @@ wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file
 
     if (unzOpenCurrentFile((unzFile)m_Archive) != UNZ_OK)
     {
-        m_lasterror = wxStream_READ_ERR;
+        m_lasterror = wxSTREAM_READ_ERROR;
         return;
     }
     m_Size = (size_t)zinfo.uncompressed_size;
@@ -90,7 +90,7 @@ size_t wxZipInputStream::OnSysRead(void *buffer, size_t bufsize)
 
     if ( m_Pos >= (off_t)m_Size )
     {
-        m_lasterror = wxStream_EOF;
+        m_lasterror = wxSTREAM_EOF;
         return 0;
     }
 
@@ -132,7 +132,7 @@ off_t wxZipInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
         unzCloseCurrentFile((unzFile)m_Archive);
         if (unzOpenCurrentFile((unzFile)m_Archive) != UNZ_OK)
         {
-            m_lasterror = wxStream_READ_ERR;
+            m_lasterror = wxSTREAM_READ_ERROR;
             return m_Pos;
         }
         toskip = nextpos;