Renamed the wxWindowCocoaScroller class to wxWindowCocoaScrollView because

[wxWidgets.git] / include / wx / ffile.h

diff --git a/include/wx/ffile.h b/include/wx/ffile.h
index 9e8067b9e21029649f2d1cfd602ef8abc2301875..0236e154bfc6d3aac06b3b5b3c3f87f6a57ac4ec 100644 (file)
--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -12,7 +12,7 @@
 #ifndef   _WX_FFILE_H_
 #define   _WX_FFILE_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "ffile.h"
 #endif
 
@@ -78,15 +78,16 @@ public:
 
   // file pointer operations (return ofsInvalid on failure)
     // move ptr ofs bytes related to start/current pos/end of file
-  bool Seek(long ofs, wxSeekMode mode = wxFromStart);
+  bool Seek(wxFileOffset ofs, wxSeekMode mode = wxFromStart);
     // move ptr to ofs bytes before the end
-  bool SeekEnd(long ofs = 0) { return Seek(ofs, wxFromEnd); }
+  bool SeekEnd(wxFileOffset ofs = 0) { return Seek(ofs, wxFromEnd); }
     // get current position in the file
-  size_t Tell() const;
+  wxFileOffset Tell() const;
     // get current file length
-  size_t Length() const;
+  wxFileOffset Length() const;
 
-  // simple accessors
+  // simple accessors: note that Eof() and Error() may only be called if
+  // IsOpened()!
     // is file opened?
   bool IsOpened() const { return m_fp != NULL; }
     // is end of file reached?