Use stock id instead of duplicating its string label in CheckFit().

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

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index 997bf03d2b56a5bb7a3fbb2cde74a9a5d7b72865..c9210559aa7c782e215adf7e54c249c775f5d1bc 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -29,6 +29,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__


@@ -57,14 +58,14 @@
 // 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") );
 


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


@@ -230,7 +239,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,7 +254,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