XRC needs wxXML, check it

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

diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
index 6b09f9876b75b897e63d318773cd3e98ba1cc0e8..866dc2ef6a348a99287ad981409761b5c5f23d07 100644 (file)
--- a/src/common/ffile.cpp
+++ b/src/common/ffile.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "ffile.h"
 #endif
 
@@ -62,12 +62,12 @@ bool wxFFile::Open(const wxChar *filename, const wxChar *mode)
     {
         wxLogSysError(_("can't open file '%s'"), filename);
 
-        return FALSE;
+        return false;
     }
 
     m_name = filename;
 
-    return TRUE;
+    return true;
 }
 
 bool wxFFile::Close()
@@ -78,13 +78,13 @@ bool wxFFile::Close()
         {
             wxLogSysError(_("can't close file '%s'"), m_name.c_str());
 
-            return FALSE;
+            return false;
         }
 
         Detach();
     }
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -93,8 +93,8 @@ bool wxFFile::Close()
 
 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") );
 
     clearerr(m_fp);
 
@@ -110,7 +110,7 @@ bool wxFFile::ReadAll(wxString *str)
         {
             wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
 
-            return FALSE;
+            return false;
         }
         //else: just EOF
 
@@ -118,7 +118,7 @@ bool wxFFile::ReadAll(wxString *str)
         *str += buf;
     }
 
-    return TRUE;
+    return true;
 }
 
 size_t wxFFile::Read(void *pBuf, size_t nCount)
@@ -159,11 +159,11 @@ bool wxFFile::Flush()
         {
             wxLogSysError(_("failed to flush the file '%s'"), m_name.c_str());
 
-            return FALSE;
+            return false;
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -172,7 +172,7 @@ bool wxFFile::Flush()
 
 bool wxFFile::Seek(long 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 )
@@ -198,14 +198,17 @@ bool wxFFile::Seek(long ofs, wxSeekMode mode)
     {
         wxLogSysError(_("Seek error on file '%s'"), m_name.c_str());
 
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 }
 
 size_t wxFFile::Tell() const
 {
+    wxCHECK_MSG( IsOpened(), (size_t)-1,
+                 _T("wxFFile::Tell(): file is closed!") );
+
     long rc = ftell(m_fp);
     if ( rc == -1 )
     {
@@ -218,6 +221,9 @@ size_t wxFFile::Tell() const
 
 size_t wxFFile::Length() const
 {
+    wxCHECK_MSG( IsOpened(), (size_t)-1,
+                 _T("wxFFile::Length(): file is closed!") );
+
     wxFFile& self = *(wxFFile *)this;   // const_cast
 
     size_t posOld = Tell();