merged optimizations from 2.2

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

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index f880a43134e3b1ec8f0c3f31ff0aa3c18f0f8679..a3eaac2586b11b3efa6d00e2ee0cc98629795db4 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -54,9 +54,31 @@ wxFFile::wxFFile(const wxChar *filename, const char *mode)
 
 bool wxFFile::Open(const wxChar *filename, const char *mode)
 {
 
 bool wxFFile::Open(const wxChar *filename, const char *mode)
 {

-    wxASSERT_MSG( !m_fp, _T("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);
+
+#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);
     m_fp = fopen(filename, mode);

+#endif
+#endif
+

 
     if ( !m_fp )
     {
 
     if ( !m_fp )
     {


@@ -93,8 +115,8 @@ bool wxFFile::Close()
 
 bool wxFFile::ReadAll(wxString *str)
 {
 
 bool wxFFile::ReadAll(wxString *str)
 {

-    wxCHECK_MSG( str, FALSE, _T("invalid parameter") );
-    wxCHECK_MSG( IsOpened(), FALSE, _T("can't read from closed file") );
+    wxCHECK_MSG( str, FALSE, wxT("invalid parameter") );
+    wxCHECK_MSG( IsOpened(), FALSE, wxT("can't read from closed file") );

 
     clearerr(m_fp);
 
 
     clearerr(m_fp);
 


@@ -123,8 +145,8 @@ bool wxFFile::ReadAll(wxString *str)
 
 size_t wxFFile::Read(void *pBuf, size_t nCount)
 {
 
 size_t wxFFile::Read(void *pBuf, size_t nCount)
 {

-    wxCHECK_MSG( pBuf, FALSE, _T("invalid parameter") );
-    wxCHECK_MSG( IsOpened(), FALSE, _T("can't read from closed file") );
+    wxCHECK_MSG( pBuf, FALSE, wxT("invalid parameter") );
+    wxCHECK_MSG( IsOpened(), FALSE, wxT("can't read from closed file") );

 
     size_t nRead = fread(pBuf, 1, nCount, m_fp);
     if ( (nRead < nCount) && Error() )
 
     size_t nRead = fread(pBuf, 1, nCount, m_fp);
     if ( (nRead < nCount) && Error() )


@@ -137,8 +159,8 @@ size_t wxFFile::Read(void *pBuf, size_t nCount)
 
 size_t wxFFile::Write(const void *pBuf, size_t nCount)
 {
 
 size_t wxFFile::Write(const void *pBuf, size_t nCount)
 {

-    wxCHECK_MSG( pBuf, FALSE, _T("invalid parameter") );
-    wxCHECK_MSG( IsOpened(), FALSE, _T("can't write to closed file") );
+    wxCHECK_MSG( pBuf, FALSE, wxT("invalid parameter") );
+    wxCHECK_MSG( IsOpened(), FALSE, wxT("can't write to closed file") );

 
     size_t nWritten = fwrite(pBuf, 1, nCount, m_fp);
     if ( nWritten < nCount )
 
     size_t nWritten = fwrite(pBuf, 1, nCount, m_fp);
     if ( nWritten < nCount )


@@ -153,7 +175,9 @@ bool wxFFile::Flush()
 {
     if ( IsOpened() )
     {
 {
     if ( IsOpened() )
     {

-        if ( !fflush(m_fp) )
+        // fflush returns non-zero on error
+        //
+        if ( fflush(m_fp) )

         {
             wxLogSysError(_("failed to flush the file '%s'"), m_name.c_str());
 
         {
             wxLogSysError(_("failed to flush the file '%s'"), m_name.c_str());
 


@@ -170,13 +194,13 @@ bool wxFFile::Flush()
 
 bool wxFFile::Seek(long ofs, wxSeekMode mode)
 {
 
 bool wxFFile::Seek(long ofs, wxSeekMode mode)
 {

-    wxCHECK_MSG( IsOpened(), FALSE, _T("can't seek on closed file") );
+    wxCHECK_MSG( IsOpened(), FALSE, wxT("can't seek on closed file") );

 
     int origin;
     switch ( mode )
     {
         default:
 
     int origin;
     switch ( mode )
     {
         default:

-            wxFAIL_MSG(_T("unknown seek mode"));
+            wxFAIL_MSG(wxT("unknown seek mode"));

             // still fall through
 
         case wxFromStart:
             // still fall through
 
         case wxFromStart: