new set of fixes for problems due to huge files support: drop wxFileSize_t, use wxFileOffset only, make wxInvalidOffset an int (main part of the patch 1063498)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-11-10 21:02:58 +00:00
parent ccfc3219db
commit 30984deafc
22 changed files with 106 additions and 99 deletions

View File

@@ -377,13 +377,13 @@ protected:
/// See wxInputStream
virtual size_t OnSysRead(void *buffer, size_t bufsize);
/// See wxInputStream
virtual off_t OnSysSeek(off_t seek, wxSeekMode mode);
virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
/// See wxInputStream
virtual off_t OnSysTell() const { return m_pos; }
virtual wxFileOffset OnSysTell() const { return m_pos; }
private:
size_t m_size;
off_t m_pos;
wxFileOffset m_pos;
bool m_simulateHHP;
char * m_content;
@@ -501,7 +501,7 @@ size_t wxChmInputStream::OnSysRead(void *buffer, size_t bufsize)
off_t wxChmInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
wxFileOffset wxChmInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
{
wxString mode_str = wxEmptyString;
@@ -512,7 +512,7 @@ off_t wxChmInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
}
m_lasterror = wxSTREAM_NO_ERROR;
off_t nextpos;
wxFileOffset nextpos;
switch ( mode )
{