corrections for final release of Mac OS X

applied patches proposed by Mark Newsam


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

src/common/ffile.cpp

@@ -64,7 +64,7 @@ bool wxFFile::Open(const wxChar *filename, const char *mode)
     tmp_fname = new char[fname_len];
     wxWX2MB(tmp_fname, filename, fname_len);
 
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)
   	m_fp = fopen(wxUnix2MacFilename( tmp_fname ), mode);
 #else
     m_fp = fopen(tmp_fname, mode);
@@ -72,7 +72,7 @@ bool wxFFile::Open(const wxChar *filename, const char *mode)
 
     delete tmp_fname;
 #else
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)
   	m_fp = fopen(wxUnix2MacFilename( filename ), mode);
 #else
     m_fp = fopen(filename, mode);