X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7502ba2975bfd348dc50fef2a978e91f543d6bfe..ee7ee4698c8c845e134c23a5e8a4a63cdd3de797:/src/common/textfile.cpp?ds=inline diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp index 678ddcc688..d67663557e 100644 --- a/src/common/textfile.cpp +++ b/src/common/textfile.cpp @@ -39,11 +39,11 @@ // default type is the native one const wxTextFile::Type wxTextFile::typeDefault = wxTextFile:: -#if defined(__WXMSW__) +#if defined(__WINDOWS__) Type_Dos; #elif defined(__UNIX__) Type_Unix; -#elif defined(__MAC__) +#elif defined(__WXMAC__) Type_Mac; // if you feel brave, remove the next line #error "wxTextFile: code for Mac files is untested." @@ -115,7 +115,7 @@ wxTextFile::Type wxTextFile::GuessType() const case Type_Unix: nUnix++; break; \ case Type_Dos: nDos++; break; \ case Type_Mac: nMac++; break; \ - default: wxFAIL_MSG("unknown line terminator"); \ + default: wxFAIL_MSG(_("unknown line terminator")); \ } uint n; @@ -164,7 +164,7 @@ bool wxTextFile::Read() int n, nRead; while ( !m_file.Eof() ) { nRead = m_file.Read(buf, WXSIZEOF(buf)); - if ( nRead == ofsInvalid ) { + if ( nRead == wxInvalidOffset ) { // read error (error message already given in wxFile::Read) m_file.Close(); return FALSE;