From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 24 Mar 2007 14:42:29 +0000 (+0000)
Subject: moved Write(const wxString&) to .cpp files as they're going to be changed again soon... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b1c673942db6ff8ed5459b96b0b5307391bc36db

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


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 1a4c3c0de8..15984f7b11 100644
--- 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 5c193284d3..7712d65f2c 100644
--- 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 997bf03d2b..c60271dbd5 100644
--- 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 5f4ec23ee3..593d78b588 100644
--- 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()
 {