Fix line indices translation in wxGrid::DoEndDragResizeLine().

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

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index 78cf20c8c3801e9c6b7b64f56f7c941b12a03b2d..7d669169a661237ec52c0298711320476df3ed7b 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "ffile.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -33,6 +29,11 @@
 #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__
+#include "wx/msw/mslu.h"

 #endif
 
 #include "wx/ffile.h"
 #endif
 
 #include "wx/ffile.h"


@@ -41,30 +42,18 @@
 // 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();
 
     (void)Open(filename, mode);
 }
 
 {
     Detach();
 
     (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") );
 


@@ -103,32 +92,31 @@ bool wxFFile::Close()
 // read/write
 // ----------------------------------------------------------------------------
 
 // read/write
 // ----------------------------------------------------------------------------
 

-bool wxFFile::ReadAll(wxString *str, wxMBConv& conv)
+bool wxFFile::ReadAll(wxString *str, const wxMBConv& conv)

 {
     wxCHECK_MSG( str, false, wxT("invalid parameter") );
     wxCHECK_MSG( IsOpened(), false, wxT("can't read from closed file") );
     wxCHECK_MSG( Length() >= 0, false, wxT("invalid length") );
 {
     wxCHECK_MSG( str, false, wxT("invalid parameter") );
     wxCHECK_MSG( IsOpened(), false, wxT("can't read from closed file") );
     wxCHECK_MSG( Length() >= 0, false, wxT("invalid length") );

-    size_t length = (size_t)Length();
+    size_t length = wx_truncate_cast(size_t, Length());

     wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") );
 
     clearerr(m_fp);
 
     wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") );
 
     clearerr(m_fp);
 

-    const size_t fileLen = Length();
-    wxCharBuffer buf(fileLen + 1);
+    wxCharBuffer buf(length + 1);

 
 

-    // note that realLen may be less than fileLen for text files with DOS EOLs
+    // 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)
     // ('\r's get dropped by CRT when reading which means that we have
     // realLen = fileLen - numOfLinesInTheFile)

-    size_t realLen = fread(buf.data(), sizeof(char), fileLen, m_fp);
+    length = fread(buf.data(), sizeof(char), length, m_fp);

 
 

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

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

-    buf.data()[realLen] = 0;
+    buf.data()[length] = 0;

     *str = wxString(buf, conv);
 
     return true;
     *str = wxString(buf, conv);
 
     return true;


@@ -136,8 +124,8 @@ bool wxFFile::ReadAll(wxString *str, wxMBConv& conv)
 
 size_t wxFFile::Read(void *pBuf, size_t nCount)
 {
 
 size_t wxFFile::Read(void *pBuf, size_t nCount)
 {

-    wxCHECK_MSG( pBuf, FALSE, wxT("invalid parameter") );
-    wxCHECK_MSG( IsOpened(), FALSE, wxT("can't read from closed file") );
+    wxCHECK_MSG( pBuf, 0, wxT("invalid parameter") );
+    wxCHECK_MSG( IsOpened(), 0, 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() )


@@ -150,8 +138,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, wxT("invalid parameter") );
-    wxCHECK_MSG( IsOpened(), FALSE, wxT("can't write to closed file") );
+    wxCHECK_MSG( pBuf, 0, wxT("invalid parameter") );
+    wxCHECK_MSG( IsOpened(), 0, 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 )


@@ -162,13 +150,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());
 


@@ -207,7 +203,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());


@@ -231,7 +227,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 )


@@ -246,7 +242,7 @@ 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 = *(wxFFile *)this;   // const_cast