use wxChar, not char, for the second argument of Open() and also use wxFopen() in...

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

diff --git a/include/wx/ffile.h b/include/wx/ffile.h
index e8c4e3a72d7b94eb17ae96e5f0ee43a25063777f..3374ed94001664d4c17c97be6118e4c05f62556c 100644 (file)
--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -42,13 +42,13 @@ public:
     // def ctor
   wxFFile() { m_fp = NULL; }
     // open specified file (may fail, use IsOpened())
-  wxFFile(const wxChar *filename, const char *mode = "r");
+  wxFFile(const wxChar *filename, const wxChar *mode = _T("r"));
     // attach to (already opened) file
   wxFFile(FILE *fp) { m_fp = fp; }
 
   // open/close
     // open a file (existing or not - the mode controls what happens)
-  bool Open(const wxChar *filename, const char *mode = "r");
+  bool Open(const wxChar *filename, const wxChar *mode = _T("r"));
     // closes the opened file (this is a NOP if not opened)
   bool Close();
 

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index 3e405491ee43dcc6815ba5c9e3b71c01bf483870..b0ea50034ee92015baf691ffd5d46f9cc8f9e886 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        ffile.cpp
-// Purpose:     wxFFile - encapsulates "FILE *" IO stream
+// Purpose:     wxFFile encapsulates "FILE *" IO stream
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     14.07.99
@@ -45,32 +45,18 @@
 // opening the file
 // ----------------------------------------------------------------------------
 
-wxFFile::wxFFile(const wxChar *filename, const char *mode)
+wxFFile::wxFFile(const wxChar *filename, const wxChar *mode)
 {
     Detach();
 
     (void)Open(filename, mode);
 }
 
-bool wxFFile::Open(const wxChar *filename, const char *mode)
+bool wxFFile::Open(const wxChar *filename, const wxChar *mode)
 {
     wxASSERT_MSG( !m_fp, wxT("should close or detach the old file first") );
 
-#if wxUSE_UNICODE
-    char *tmp_fname;
-    size_t fname_len;
-
-    fname_len = wxStrlen(filename)+1;
-    tmp_fname = new char[fname_len];
-    wxWX2MB(tmp_fname, filename, fname_len);
-
-    m_fp = fopen(tmp_fname, mode);
-
-    delete tmp_fname;
-#else
-    m_fp = fopen(filename, mode);
-#endif
-
+    m_fp = wxFopen(filename, mode);
 
     if ( !m_fp )
     {