X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fde6fcc9b551340a194ae4c726db5ab64b5c594..878711c01c1b9ad5b97d35f379a048b8ce1bfb49:/src/common/ffile.cpp?ds=inline

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index a3eaac2586..6b09f9876b 100644
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        ffile.cpp
-// Purpose:     wxFFile - encapsulates "FILE *" IO stream
+// Purpose:     wxFFile encapsulates "FILE *" IO stream
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     14.07.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -28,7 +28,7 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_FILE
+#if wxUSE_FFILE
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
@@ -45,40 +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);
-
-#if defined(__WXMAC__) && !defined(__UNIX__)
-  	m_fp = fopen(wxUnix2MacFilename( tmp_fname ), mode);
-#else
-    m_fp = fopen(tmp_fname, mode);
-#endif
-
-    delete tmp_fname;
-#else
-#if defined(__WXMAC__) && !defined(__UNIX__)
-  	m_fp = fopen(wxUnix2MacFilename( filename ), mode);
-#else
-    m_fp = fopen(filename, mode);
-#endif
-#endif
-
+    m_fp = wxFopen(filename, mode);
 
     if ( !m_fp )
     {
@@ -258,4 +236,4 @@ size_t wxFFile::Length() const
     return (size_t)-1;
 }
 
-#endif // wxUSE_FILE
+#endif // wxUSE_FFILE