Fixed return code of GetSelectionCount()

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

diff --git a/include/wx/file.h b/include/wx/file.h
index 11d935dacc5c9f22b87ca1a40802a77e50b004b9..ede2b55b170117bfca1b49f5675bb31206333519 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -17,8 +17,10 @@
 #pragma interface "file.h"
 #endif
 
 #pragma interface "file.h"
 #endif
 

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

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -53,7 +55,6 @@ class WXDLLEXPORT wxFile
 public:
   // more file constants
   // -------------------
 public:
   // more file constants
   // -------------------

-

     // opening mode
   enum OpenMode { read, write, read_write, write_append };
     // standard values for file descriptor
     // opening mode
   enum OpenMode { read, write, read_write, write_append };
     // standard values for file descriptor


@@ -61,7 +62,11 @@ public:
 
   // static functions
   // ----------------
 
   // static functions
   // ----------------

-  static bool Exists(const char *sz);  // also checks it's a regular file
+    // check whether a regular file by this name exists
+  static bool Exists(const char *name);
+    // check whetther we can access the given file in given mode
+    // (only read and write make sense here)
+  static bool Access(const char *name, OpenMode mode);

 
   // ctors
   // -----
 
   // ctors
   // -----


@@ -90,7 +95,7 @@ public:
     // returns number of bytes read or ofsInvalid on error
   off_t Read(void *pBuf, off_t nCount);
     // returns true on success
     // returns number of bytes read or ofsInvalid on error
   off_t Read(void *pBuf, off_t nCount);
     // returns true on success

-  uint Write(const void *pBuf, uint nCount);
+  size_t Write(const void *pBuf, size_t nCount);

     // returns true on success
   bool Write(const wxString& s) { return Write(s.c_str(), s.Len()) != 0; }
     // flush data not yet written
     // returns true on success
   bool Write(const wxString& s) { return Write(s.c_str(), s.Len()) != 0; }
     // flush data not yet written


@@ -115,7 +120,7 @@ public:
   bool Error() const { return m_error; }
 
   // dtor closes the file if opened
   bool Error() const { return m_error; }
 
   // dtor closes the file if opened

-  virtual ~wxFile(); // Temporally virtual because of wxFileStream: I'll change back in a near future.
+  ~wxFile();

 
 private:
   // copy ctor and assignment operator are private because
 
 private:
   // copy ctor and assignment operator are private because


@@ -151,7 +156,7 @@ public:
   bool IsOpened() const { return m_file.IsOpened(); }
 
   // I/O (both functions return true on success, false on failure)
   bool IsOpened() const { return m_file.IsOpened(); }
 
   // I/O (both functions return true on success, false on failure)

-  bool Write(const void *p, uint n) { return m_file.Write(p, n) != 0; }
+  bool Write(const void *p, size_t n) { return m_file.Write(p, n) != 0; }

   bool Write(const wxString& str)   { return m_file.Write(str); }
 
   // different ways to close the file
   bool Write(const wxString& str)   { return m_file.Write(str); }
 
   // different ways to close the file


@@ -170,4 +175,4 @@ private:
 };
 
 #endif
 };
 
 #endif

-        // __FILEH__
+        // _WX_FILEH__