X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67c20e133ebe01b5b4bc2468661a8bcc4097c5a2..abb4f9c93715f5b00c526203af96ed2938a1a2c3:/src/common/textfile.cpp?ds=sidebyside diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp index 604bb54c4c..8a47c35e39 100644 --- a/src/common/textfile.cpp +++ b/src/common/textfile.cpp @@ -13,10 +13,6 @@ // headers // ============================================================================ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "textfile.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -97,7 +93,7 @@ bool wxTextFile::OnRead(wxMBConv& conv) char *strBuf, *strPtr, *strEnd; char ch, chLast = '\0'; char buf[1024]; - wxFileSize_t nRead; + size_t nRead; strPtr = strBuf = new char[1024]; strEnd = strBuf + 1024; @@ -105,14 +101,14 @@ bool wxTextFile::OnRead(wxMBConv& conv) do { nRead = m_file.Read(buf, WXSIZEOF(buf)); - if ( nRead == wxInvalidOffset ) + if ( nRead == (size_t)wxInvalidOffset ) { // read error (error message already given in wxFile::Read) delete[] strBuf; return false; } - for (wxFileSize_t n = 0; n < nRead; n++) + for (size_t n = 0; n < nRead; n++) { ch = buf[n]; switch ( ch )