systen encoding for mac

[wxWidgets.git] / src / common / ffile.cpp

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index afbd6d14ea09967062081e1ce0bd193925a88709..95105fbfedea2ebc60f4b60c317bdf2a54b1e84b 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        ffile.cpp
 /////////////////////////////////////////////////////////////////////////////
 // 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>
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "ffile.h"
 #endif
 
     #pragma implementation "ffile.h"
 #endif
 


@@ -28,7 +28,7 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_FILE
+#if wxUSE_FFILE

 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"


@@ -45,32 +45,18 @@
 // opening the file
 // ----------------------------------------------------------------------------
 
 // opening the file
 // ----------------------------------------------------------------------------
 

-wxFFile::wxFFile(const wxChar *filename, const char *mode)
+wxFFile::wxFFile(const wxChar *filename, const wxChar *mode)

 {
     Detach();
 
     (void)Open(filename, 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") );
 
 {
     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 )
     {
 
     if ( !m_fp )
     {


@@ -250,4 +236,4 @@ size_t wxFFile::Length() const
     return (size_t)-1;
 }
 
     return (size_t)-1;
 }
 

-#endif // wxUSE_FILE
+#endif // wxUSE_FFILE