* New wxStream classes: wxStreamBuffer and wxObject*Stream.
* Changes: ofsInvalid => wxInvalidOffset in filefn.h * Updates: all wxStream classes use wxStreamBuffer. wxObject basic declaration changes (added LoadObject, modified StoreObject) * Some base of the serialization. (I hope not to have forgotten any files) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -131,7 +131,7 @@ wxTextFile::Type wxTextFile::GuessType() const
|
||||
// interpret the results (@@ far from being even 50% fool proof)
|
||||
if ( nDos + nUnix + nMac == 0 ) {
|
||||
// no newlines at all
|
||||
wxLogWarning(_("'%s' is probably a binary file."), m_strFile.c_str());
|
||||
wxLogWarning("'%s' is probably a binary file.", m_strFile.c_str());
|
||||
}
|
||||
else {
|
||||
#define GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault \
|
||||
@@ -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;
|
||||
@@ -224,7 +224,7 @@ bool wxTextFile::Write(Type typeNew)
|
||||
wxTempFile fileTmp(m_strFile);
|
||||
|
||||
if ( !fileTmp.IsOpened() ) {
|
||||
wxLogError(_("can't write file '%s' to disk."), m_strFile.c_str());
|
||||
wxLogError("can't write file '%s' to disk.", m_strFile.c_str());
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user