Misc validity fixes to samples/xrc/rc/*.xrc.

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

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index 997bf03d2b56a5bb7a3fbb2cde74a9a5d7b72865..0f479565d2406ff0a3a73be12e4b07e4941f9d57 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        ffile.cpp
+// Name:        src/common/ffile.cpp

 // Purpose:     wxFFile encapsulates "FILE *" IO stream
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     14.07.99
 // 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 licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -29,6 +28,7 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/crt.h"

 #endif
 
 #ifdef __WINDOWS__
 #endif
 
 #ifdef __WINDOWS__


@@ -41,43 +41,31 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-// ----------------------------------------------------------------------------
-// seek and tell with large file support if available
-// ----------------------------------------------------------------------------
-
-#ifdef HAVE_FSEEKO
-#   define wxFseek fseeko
-#   define wxFtell ftello
-#else
-#   define wxFseek fseek
-#   define wxFtell ftell
-#endif
-

 // ----------------------------------------------------------------------------
 // opening the file
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // opening the file
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    Detach();
+    m_fp = NULL;

 
     (void)Open(filename, mode);
 }
 
 
     (void)Open(filename, mode);
 }
 

-bool wxFFile::Open(const wxChar *filename, const wxChar *mode)
+bool wxFFile::Open(const wxString& filename, const wxString& 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") );
 

-    m_fp = wxFopen(filename, mode);
+    FILE* const fp = wxFopen(filename, mode);

 
 

-    if ( !m_fp )
+    if ( !fp )

     {
         wxLogSysError(_("can't open file '%s'"), filename);
 
         return false;
     }
 
     {
         wxLogSysError(_("can't open file '%s'"), filename);
 
         return false;
     }
 

-    m_name = filename;
+    Attach(fp, filename);

 
     return true;
 }
 
     return true;
 }


@@ -93,7 +81,7 @@ bool wxFFile::Close()
             return false;
         }
 
             return false;
         }
 

-        Detach();
+        m_fp = NULL;

     }
 
     return true;
     }
 
     return true;


@@ -113,14 +101,14 @@ bool wxFFile::ReadAll(wxString *str, const wxMBConv& conv)
 
     clearerr(m_fp);
 
 
     clearerr(m_fp);
 

-    wxCharBuffer buf(length + 1);
+    wxCharBuffer buf(length);

 
     // note that real length may be less than file length for text files with DOS EOLs
     // ('\r's get dropped by CRT when reading which means that we have
     // realLen = fileLen - numOfLinesInTheFile)
 
     // note that real length may be less than file length for text files with DOS EOLs
     // ('\r's get dropped by CRT when reading which means that we have
     // realLen = fileLen - numOfLinesInTheFile)

-    length = fread(buf.data(), sizeof(char), length, m_fp);
+    length = fread(buf.data(), 1, length, m_fp);

 
 

-    if ( Error() ) 
+    if ( Error() )

     {
         wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
 
     {
         wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
 


@@ -128,7 +116,9 @@ bool wxFFile::ReadAll(wxString *str, const wxMBConv& conv)
     }
 
     buf.data()[length] = 0;
     }
 
     buf.data()[length] = 0;

-    *str = wxString(buf, conv);
+
+    wxString strTmp(buf, conv);
+    str->swap(strTmp);

 
     return true;
 }
 
     return true;
 }


@@ -161,13 +151,21 @@ size_t wxFFile::Write(const void *pBuf, size_t nCount)
     return nWritten;
 }
 
     return nWritten;
 }
 

+bool wxFFile::Write(const wxString& s, const wxMBConv& conv)
+{
+  const wxWX2MBbuf buf = s.mb_str(conv);
+  if ( !buf )
+      return false;
+
+  const size_t size = strlen(buf); // FIXME: use buf.length() when available
+  return Write(buf, size) == size;
+}
+

 bool wxFFile::Flush()
 {
     if ( IsOpened() )
     {
 bool wxFFile::Flush()
 {
     if ( IsOpened() )
     {

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

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


@@ -206,7 +204,7 @@ bool wxFFile::Seek(wxFileOffset ofs, wxSeekMode mode)
             break;
     }
 
             break;
     }
 

-#ifndef HAVE_FSEEKO
+#ifndef wxHAS_LARGE_FFILES

     if ((long)ofs != ofs)
     {
         wxLogError(_("Seek error on file '%s' (large files not supported by stdio)"), m_name.c_str());
     if ((long)ofs != ofs)
     {
         wxLogError(_("Seek error on file '%s' (large files not supported by stdio)"), m_name.c_str());


@@ -230,7 +228,7 @@ bool wxFFile::Seek(wxFileOffset ofs, wxSeekMode mode)
 wxFileOffset wxFFile::Tell() const
 {
     wxCHECK_MSG( IsOpened(), wxInvalidOffset,
 wxFileOffset wxFFile::Tell() const
 {
     wxCHECK_MSG( IsOpened(), wxInvalidOffset,

-                 _T("wxFFile::Tell(): file is closed!") );
+                 wxT("wxFFile::Tell(): file is closed!") );

 
     wxFileOffset rc = wxFtell(m_fp);
     if ( rc == wxInvalidOffset )
 
     wxFileOffset rc = wxFtell(m_fp);
     if ( rc == wxInvalidOffset )


@@ -245,9 +243,9 @@ wxFileOffset wxFFile::Tell() const
 wxFileOffset wxFFile::Length() const
 {
     wxCHECK_MSG( IsOpened(), wxInvalidOffset,
 wxFileOffset wxFFile::Length() const
 {
     wxCHECK_MSG( IsOpened(), wxInvalidOffset,

-                 _T("wxFFile::Length(): file is closed!") );
+                 wxT("wxFFile::Length(): file is closed!") );

 
 

-    wxFFile& self = *(wxFFile *)this;   // const_cast
+    wxFFile& self = *const_cast<wxFFile *>(this);

 
     wxFileOffset posOld = Tell();
     if ( posOld != wxInvalidOffset )
 
     wxFileOffset posOld = Tell();
     if ( posOld != wxInvalidOffset )