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

moved Write(const wxString&) to .cpp files as they're going to be changed again soon; removed unnecessary casts

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-24 14:42:29 +00:00
parent bd3f83f763
commit b1c673942d
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/ffile.h
View File

@@ -62,17 +62,7 @@ public:
// returns the number of bytes written
size_t Write(const void *pBuf, size_t nCount);
// returns true on success
bool Write(const wxString& s, const wxMBConv& conv = wxConvAuto())
{
const wxWX2MBbuf buf = s.mb_str(conv);
if (buf)
{
size_t size = strlen(buf);
return Write((const char *)buf, size) == size;
}
else
return false;
}
bool Write(const wxString& s, const wxMBConv& conv = wxConvAuto());
// flush data not yet written
bool Flush();

12
include/wx/file.h
View File

@@ -97,17 +97,7 @@ public:
// returns the number of bytes written
size_t Write(const void *pBuf, size_t nCount);
// returns true on success
bool Write(const wxString& s, const wxMBConv& conv = wxConvUTF8)
{
const wxWX2MBbuf buf = s.mb_str(conv);
if (buf)
{
size_t size = strlen(buf);
return Write((const char *) buf, size) == size;
}
else
return false;
}
bool Write(const wxString& s, const wxMBConv& conv = wxConvUTF8);
// flush data not yet written
bool Flush();

14
src/common/ffile.cpp
View File

@@ -161,13 +161,21 @@ size_t wxFFile::Write(const void *pBuf, size_t nCount)
return nWritten;
}
bool wxFFile::Write(const wxString& s, const wxMBConv& conv)
{
const wxWX2MBbuf buf = s.mb_str(conv);
if ( !buf )
return false;
const size_t size = strlen(buf); // FIXME: use buf.length() when available
return Write(buf, size) == size;
}
bool wxFFile::Flush()
{
if ( IsOpened() )
{
// fflush returns non-zero on error
//
if ( fflush(m_fp) )
if ( fflush(m_fp) != 0 )
{
wxLogSysError(_("failed to flush the file '%s'"), m_name.c_str());

10
src/common/file.cpp
View File

@@ -323,6 +323,16 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
return iRc;
}
bool wxFile::Write(const wxString& s, const wxMBConv& conv)
{
const wxWX2MBbuf buf = s.mb_str(conv);
if ( !buf )
return false;
const size_t size = strlen(buf); // FIXME: use buf.length() when available
return Write(buf, size) == size;
}
// flush
bool wxFile::Flush()
{