X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3140390f99a9f2e78840451ee0eff2af0bc0af0..19cf1ef3a7077dd99a90f141847b8a9b67b318c9:/include/wx/ffile.h?ds=sidebyside diff --git a/include/wx/ffile.h b/include/wx/ffile.h index 1a4c3c0de8..fff114e2a4 100644 --- a/include/wx/ffile.h +++ b/include/wx/ffile.h @@ -37,13 +37,13 @@ public: // def ctor wxFFile() { m_fp = NULL; } // open specified file (may fail, use IsOpened()) - wxFFile(const wxChar *filename, const wxChar *mode = _T("r")); + wxFFile(const wxString& filename, const wxString& mode = _T("r")); // attach to (already opened) file wxFFile(FILE *lfp) { m_fp = lfp; } // open/close // open a file (existing or not - the mode controls what happens) - bool Open(const wxChar *filename, const wxChar *mode = _T("r")); + bool Open(const wxString& filename, const wxString& mode = _T("r")); // closes the opened file (this is a NOP if not opened) bool Close(); @@ -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();