Made gnome printing stuff return wxPRINT_CANCELLED if

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

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index 3e405491ee43dcc6815ba5c9e3b71c01bf483870..736bbea55f9717f1778d24470b6851ecb2cab0dd 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        ffile.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        ffile.cpp

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

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "ffile.h"
 #endif
 
     #pragma implementation "ffile.h"
 #endif
 


@@ -41,47 +41,45 @@
 // 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 char *mode)
+wxFFile::wxFFile(const wxChar *filename, const wxChar *mode)

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

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

-#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);
-
-    m_fp = fopen(tmp_fname, mode);
-
-    delete tmp_fname;
-#else
-    m_fp = fopen(filename, mode);
-#endif
-
+    m_fp = wxFopen(filename, mode);

 
     if ( !m_fp )
     {
         wxLogSysError(_("can't open file '%s'"), filename);
 
 
     if ( !m_fp )
     {
         wxLogSysError(_("can't open file '%s'"), filename);
 

-        return FALSE;
+        return false;

     }
 
     m_name = filename;
 
     }
 
     m_name = filename;
 

-    return TRUE;
+    return true;

 }
 
 bool wxFFile::Close()
 }
 
 bool wxFFile::Close()


@@ -92,13 +90,13 @@ bool wxFFile::Close()
         {
             wxLogSysError(_("can't close file '%s'"), m_name.c_str());
 
         {
             wxLogSysError(_("can't close file '%s'"), m_name.c_str());
 

-            return FALSE;
+            return false;

         }
 
         Detach();
     }
 
         }
 
         Detach();
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -107,13 +105,16 @@ bool wxFFile::Close()
 
 bool wxFFile::ReadAll(wxString *str)
 {
 
 bool wxFFile::ReadAll(wxString *str)
 {

-    wxCHECK_MSG( str, FALSE, wxT("invalid parameter") );
-    wxCHECK_MSG( IsOpened(), FALSE, wxT("can't read from closed file") );
+    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();
+    wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") );

 
     clearerr(m_fp);
 
     str->Empty();
 
     clearerr(m_fp);
 
     str->Empty();

-    str->Alloc(Length());
+    str->Alloc(length);

 
     wxChar buf[1024];
     static const size_t nSize = WXSIZEOF(buf) - 1; // -1 for trailing '\0'
 
     wxChar buf[1024];
     static const size_t nSize = WXSIZEOF(buf) - 1; // -1 for trailing '\0'


@@ -124,7 +125,7 @@ bool wxFFile::ReadAll(wxString *str)
         {
             wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
 
         {
             wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
 

-            return FALSE;
+            return false;

         }
         //else: just EOF
 
         }
         //else: just EOF
 


@@ -132,7 +133,7 @@ bool wxFFile::ReadAll(wxString *str)
         *str += buf;
     }
 
         *str += buf;
     }
 

-    return TRUE;
+    return true;

 }
 
 size_t wxFFile::Read(void *pBuf, size_t nCount)
 }
 
 size_t wxFFile::Read(void *pBuf, size_t nCount)


@@ -173,20 +174,20 @@ bool wxFFile::Flush()
         {
             wxLogSysError(_("failed to flush the file '%s'"), m_name.c_str());
 
         {
             wxLogSysError(_("failed to flush the file '%s'"), m_name.c_str());
 

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // seeking
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // seeking
 // ----------------------------------------------------------------------------
 

-bool wxFFile::Seek(long ofs, wxSeekMode mode)
+bool wxFFile::Seek(wxFileOffset ofs, wxSeekMode mode)

 {
 {

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

 
     int origin;
     switch ( mode )
 
     int origin;
     switch ( mode )


@@ -208,38 +209,55 @@ bool wxFFile::Seek(long ofs, wxSeekMode mode)
             break;
     }
 
             break;
     }
 

-    if ( fseek(m_fp, ofs, origin) != 0 )
+#ifndef HAVE_FSEEKO
+    if ((long)ofs != ofs)
+    {
+        wxLogError(_("Seek error on file '%s' (large files not supported by stdio)"), m_name.c_str());
+
+        return false;
+    }
+
+    if ( wxFseek(m_fp, (long)ofs, origin) != 0 )
+#else
+    if ( wxFseek(m_fp, ofs, origin) != 0 )
+#endif

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

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

-size_t wxFFile::Tell() const
+wxFileOffset wxFFile::Tell() const

 {
 {

-    long rc = ftell(m_fp);
-    if ( rc == -1 )
+    wxCHECK_MSG( IsOpened(), wxInvalidOffset,
+                 _T("wxFFile::Tell(): file is closed!") );
+
+    wxFileOffset rc = wxFtell(m_fp);
+    if ( rc == wxInvalidOffset )

     {
         wxLogSysError(_("Can't find current position in file '%s'"),
                       m_name.c_str());
     }
 
     {
         wxLogSysError(_("Can't find current position in file '%s'"),
                       m_name.c_str());
     }
 

-    return (size_t)rc;
+    return rc;

 }
 
 }
 

-size_t wxFFile::Length() const
+wxFileOffset wxFFile::Length() const

 {
 {

+    wxCHECK_MSG( IsOpened(), wxInvalidOffset,
+                 _T("wxFFile::Length(): file is closed!") );
+

     wxFFile& self = *(wxFFile *)this;   // const_cast
 
     wxFFile& self = *(wxFFile *)this;   // const_cast
 

-    size_t posOld = Tell();
-    if ( posOld != (size_t)-1 )
+    wxFileOffset posOld = Tell();
+    if ( posOld != wxInvalidOffset )

     {
         if ( self.SeekEnd() )
         {
     {
         if ( self.SeekEnd() )
         {

-            size_t len = Tell();
+            wxFileOffset len = Tell();

 
             (void)self.Seek(posOld);
 
 
             (void)self.Seek(posOld);
 


@@ -247,7 +265,7 @@ size_t wxFFile::Length() const
         }
     }
 
         }
     }
 

-    return (size_t)-1;
+    return wxInvalidOffset;

 }
 
 #endif // wxUSE_FFILE
 }
 
 #endif // wxUSE_FFILE