Add missing WXK constants for the control keys

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

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index c9210559aa7c782e215adf7e54c249c775f5d1bc..ae196692041bcc9726fc2c5f530a178e5e394841 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxFFile encapsulates "FILE *" IO stream
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxFFile encapsulates "FILE *" IO stream
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -42,18 +42,6 @@
 // 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
 // ----------------------------------------------------------------------------


@@ -121,7 +109,7 @@ bool wxFFile::ReadAll(wxString *str, const wxMBConv& conv)
     // realLen = fileLen - numOfLinesInTheFile)
     length = fread(buf.data(), sizeof(char), length, m_fp);
 
     // realLen = fileLen - numOfLinesInTheFile)
     length = fread(buf.data(), sizeof(char), 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());
 


@@ -129,7 +117,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;
 }


@@ -215,7 +205,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());


@@ -256,7 +246,7 @@ wxFileOffset wxFFile::Length() const
     wxCHECK_MSG( IsOpened(), wxInvalidOffset,
                  wxT("wxFFile::Length(): file is closed!") );
 
     wxCHECK_MSG( IsOpened(), wxInvalidOffset,
                  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 )