X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1b82138efe9aacda4e0ad7ce4b1551d624524c4..60161cfac9dba5a7688e0622784b7bc2fffd859e:/include/wx/ffile.h?ds=inline

diff --git a/include/wx/ffile.h b/include/wx/ffile.h
index 6a3f6fdb9e..969aa40039 100644
--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -51,7 +51,7 @@ public:
   bool Close();
 
   // assign an existing file descriptor and get it back from wxFFile object
-  void Attach(FILE *fp, const wxString& name = _T(""))
+  void Attach(FILE *fp, const wxString& name = wxT(""))
     { Close(); m_fp = fp; m_name = name; }
   void Detach() { m_fp = NULL; }
   FILE *fp() const { return m_fp; }
@@ -65,10 +65,11 @@ 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)
+  bool Write(const wxString& s, wxMBConv& conv = wxConvLibc)
   {
-      size_t size = s.Len()*sizeof(wxChar);
-      return Write(s.c_str(), size) == size;
+      const wxWX2MBbuf buf = s.mb_str(conv);
+      size_t size = strlen(buf);
+      return Write((const char *)buf, size) == size;
   }
     // flush data not yet written
   bool Flush();