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

added wxMBConv parameter for wxFFile::ReadAll() and documented it (improved patch 1041642)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-02-19 15:53:04 +00:00
parent b2f3b00bd2
commit 3e15dde396
4 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/ffile.cpp
View File

@@ -103,7 +103,7 @@ bool wxFFile::Close()
// read/write
// ----------------------------------------------------------------------------
bool wxFFile::ReadAll(wxString *str)
bool wxFFile::ReadAll(wxString *str, wxMBConv& conv)
{
wxCHECK_MSG( str, false, wxT("invalid parameter") );
wxCHECK_MSG( IsOpened(), false, wxT("can't read from closed file") );
@@ -113,26 +113,18 @@ bool wxFFile::ReadAll(wxString *str)
clearerr(m_fp);
str->Empty();
str->Alloc(length);
wxChar buf[1024];
static const size_t nSize = WXSIZEOF(buf) - 1; // -1 for trailing '\0'
while ( !Eof() )
const size_t fileLen = Length();
wxCharBuffer buf(fileLen + 1);
if ( (fread(buf.data(), sizeof(char), fileLen, m_fp) < fileLen) || Error() )
{
size_t nRead = fread(buf, sizeof(wxChar), nSize, m_fp);
if ( (nRead < nSize) && Error() )
{
wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
return false;
}
//else: just EOF
buf[nRead] = 0;
*str += buf;
return false;
}
buf.data()[fileLen] = 0;
*str = wxString(buf, conv);
return true;
}