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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/ffile.h b/include/wx/ffile.h
index 1a4c3c0de8f31dfe95486f930a3f2f2fe1cc1f84..15984f7b1108bff36787bacd0ff619cf1d14effa 100644 (file)
--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -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();
 

diff --git a/include/wx/file.h b/include/wx/file.h
index 5c193284d398b79f60c3c6377b917521ca024aed..7712d65f2cf9b0ed02584f2b716d794046f3a7f9 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -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();
 

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index 997bf03d2b56a5bb7a3fbb2cde74a9a5d7b72865..c60271dbd5d21974c1f50bd75fa4b9b266575dd0 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -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());
 

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 5f4ec23ee39c553de879139a43333a7d060c337b..593d78b5881f183b192d3f8056956584dfcdbf05 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -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()
 {