X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..8a8dcc3421f4740681173a6fbe8359fc977599dc:/src/html/chm.cpp?ds=sidebyside diff --git a/src/html/chm.cpp b/src/html/chm.cpp index c0d24cdc01..b7dc1ee4f5 100644 --- a/src/html/chm.cpp +++ b/src/html/chm.cpp @@ -122,7 +122,7 @@ wxChmTools::wxChmTools(const wxFileName &archive) // strdup() [libmspack-20030726], which would cause crashes in // Unicode build when mb_str() returns temporary buffer m_chmFileNameANSI = strdup((const char*)m_chmFileName.mb_str(wxConvFile)); - + // Open the archive and store it in class: if ( (chmh = chmd->open(chmd, (char*)m_chmFileNameANSI)) ) { @@ -204,7 +204,7 @@ bool wxChmTools::Contains(const wxString& pattern) * * Finds the next file descibed by a pattern in the archive, starting * the file given by second parameter - * + * * @param pattern The file-pattern to search for. May contain '*' and/or '?' * @param startfrom The filename which the search should start after * @returns The full pathname of the found 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 ) {