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

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/textfile.cpp
View File

@@ -67,10 +67,10 @@ const wxChar *wxTextFile::GetEOL(wxTextFileType type)
wxFAIL_MSG(wxT("bad file type in wxTextFile::GetEOL."));
// fall through nevertheless - we must return something...
case wxTextFileType_None: return wxT(_T(""));
case wxTextFileType_Unix: return wxT(_T("\n"));
case wxTextFileType_Dos: return wxT(_T("\r\n"));
case wxTextFileType_Mac: return wxT(_T("\r"));
case wxTextFileType_None: return wxT("");
case wxTextFileType_Unix: return wxT("\n");
case wxTextFileType_Dos: return wxT("\r\n");
case wxTextFileType_Mac: return wxT("\r");
}
}
@@ -286,7 +286,7 @@ bool wxTextFile::Read()
char ch, chLast = '\0';
char buf[1024];
int n, nRead;
while ( !m_file.Eof() ) {
do {
nRead = m_file.Read(buf, WXSIZEOF(buf));
if ( nRead == wxInvalidOffset ) {
// read error (error message already given in wxFile::Read)
@@ -329,7 +329,7 @@ bool wxTextFile::Read()
}
}
}
}
} while ( nRead == WXSIZEOF(buf) );
// anything in the last line?
if ( !str.IsEmpty() ) {