changes to match listctrl.h changes (forgot to commit yesterday, sorry)

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

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index a3eaac2586b11b3efa6d00e2ee0cc98629795db4..3e405491ee43dcc6815ba5c9e3b71c01bf483870 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -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"


@@ -64,20 +64,12 @@ bool wxFFile::Open(const wxChar *filename, const char *mode)
     tmp_fname = new char[fname_len];
     wxWX2MB(tmp_fname, filename, fname_len);
 
     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);
     m_fp = fopen(tmp_fname, mode);

-#endif

 
     delete tmp_fname;
 
     delete tmp_fname;

-#else
-#if defined(__WXMAC__) && !defined(__UNIX__)
-       m_fp = fopen(wxUnix2MacFilename( filename ), mode);

 #else
     m_fp = fopen(filename, mode);
 #endif
 #else
     m_fp = fopen(filename, mode);
 #endif

-#endif

 
 
     if ( !m_fp )
 
 
     if ( !m_fp )


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

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