fix for CW compilation

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

diff --git a/include/wx/file.h b/include/wx/file.h
index 2bc154269882d59a4474753069577c6a45cdf695..15b35b8d83776ec0cfdc1e74d5a1764c2bbb8f1d 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -17,11 +17,9 @@
 #pragma interface "file.h"
 #endif
 
 #pragma interface "file.h"
 #endif
 

-#ifndef WX_PRECOMP
-  #include  "wx/string.h"
-  #include  "wx/filefn.h"
-  #include  "wx/strconv.h"
-#endif
+#include  "wx/string.h"
+#include  "wx/filefn.h"
+#include  "wx/strconv.h"

 
 #if wxUSE_FILE
 
 
 #if wxUSE_FILE
 


@@ -68,7 +66,7 @@ public:
   // ----------------
     // check whether a regular file by this name exists
   static bool Exists(const wxChar *name);
   // ----------------
     // check whether a regular file by this name exists
   static bool Exists(const wxChar *name);

-    // check whetther we can access the given file in given mode
+    // check whether we can access the given file in given mode

     // (only read and write make sense here)
   static bool Access(const wxChar *name, OpenMode mode);
 
     // (only read and write make sense here)
   static bool Access(const wxChar *name, OpenMode mode);
 


@@ -84,7 +82,7 @@ public:
   // open/close
     // create a new file (with the default value of bOverwrite, it will fail if
     // the file already exists, otherwise it will overwrite it and succeed)
   // open/close
     // create a new file (with the default value of bOverwrite, it will fail if
     // the file already exists, otherwise it will overwrite it and succeed)

-  bool Create(const wxChar *szFileName, bool bOverwrite = FALSE,
+  bool Create(const wxChar *szFileName, bool bOverwrite = false,

               int access = wxS_DEFAULT);
   bool Open(const wxChar *szFileName, OpenMode mode = read,
             int access = wxS_DEFAULT);
               int access = wxS_DEFAULT);
   bool Open(const wxChar *szFileName, OpenMode mode = read,
             int access = wxS_DEFAULT);


@@ -97,7 +95,7 @@ public:
 
   // read/write (unbuffered)
     // returns number of bytes read or ofsInvalid on error
 
   // read/write (unbuffered)
     // returns number of bytes read or ofsInvalid on error

-  off_t Read(void *pBuf, off_t nCount);
+  size_t Read(void *pBuf, size_t nCount);

     // returns the number of bytes written
   size_t Write(const void *pBuf, size_t nCount);
     // returns true on success
     // returns the number of bytes written
   size_t Write(const void *pBuf, size_t nCount);
     // returns true on success


@@ -112,13 +110,13 @@ public:
 
   // file pointer operations (return ofsInvalid on failure)
     // move ptr ofs bytes related to start/current off_t/end of file
 
   // file pointer operations (return ofsInvalid on failure)
     // move ptr ofs bytes related to start/current off_t/end of file

-  off_t Seek(off_t ofs, wxSeekMode mode = wxFromStart);
+  wxFileOffset Seek(wxFileOffset ofs, wxSeekMode mode = wxFromStart);

     // move ptr to ofs bytes before the end
     // move ptr to ofs bytes before the end

-  off_t SeekEnd(off_t ofs = 0) { return Seek(ofs, wxFromEnd); }
+  wxFileOffset SeekEnd(wxFileOffset ofs = 0) { return Seek(ofs, wxFromEnd); }

     // get current off_t
     // get current off_t

-  off_t Tell() const;
+  wxFileOffset Tell() const;

     // get current file length
     // get current file length

-  off_t Length() const;
+  wxFileOffset Length() const;

 
   // simple accessors
     // is file opened?
 
   // simple accessors
     // is file opened?