Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/zipstrm.cpp
View File

@@ -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;