Small changes after Robert's edits

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

diff --git a/include/wx/file.h b/include/wx/file.h
index e3f8ab1fc3b0667400606bef86198a3bb518fdc2..c422a034ef78dfc07beb284afa50908dd540e9a5 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -7,7 +7,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef   __FILEH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef   __FILEH__


@@ -17,27 +17,32 @@
 #pragma interface "file.h"
 #endif
 
 #pragma interface "file.h"
 #endif
 

-// ----------------------------------------------------------------------------
-// simple types
-// ----------------------------------------------------------------------------
-
-#include  "wx/string.h"
-#include  "wx/filefn.h"
-#include  "wx/stream.h" // for wxSeekMode
-
-// define off_t
-#include  <sys/types.h>
-
-#ifdef    _MSC_VER
-  #define   off_t       _off_t
+#ifndef WX_PRECOMP
+  #include  "wx/string.h"
+  #include  "wx/filefn.h"

 #endif
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 #endif
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 

-// error return value for Seek() functions
-const off_t ofsInvalid = (off_t)-1;
+// we redefine these constants here because S_IREAD &c are _not_ standard
+// however, we do assume that the values correspond to the Unix umask bits
+#define wxS_IRUSR 00400
+#define wxS_IWUSR 00200
+#define wxS_IXUSR 00100
+
+#define wxS_IRGRP 00040
+#define wxS_IWGRP 00020
+#define wxS_IXGRP 00010
+
+#define wxS_IROTH 00004
+#define wxS_IWOTH 00002
+#define wxS_IXOTH 00001
+
+// default mode for the new files: corresponds to umask 022
+#define wxS_DEFAULT   (wxS_IRUSR | wxS_IWUSR | wxS_IRGRP | wxS_IWGRP |\
+                       wxS_IROTH | wxS_IWOTH)

 
 // ----------------------------------------------------------------------------
 // class wxFile: raw file IO
 
 // ----------------------------------------------------------------------------
 // class wxFile: raw file IO


@@ -50,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


@@ -58,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
   // -----


@@ -70,9 +78,13 @@ public:
   wxFile(int fd) { m_fd = fd; }
 
   // open/close
   wxFile(int fd) { m_fd = fd; }
 
   // open/close

-  bool Create(const char *szFileName, bool bOverwrite = FALSE);
-  bool Open(const char *szFileName, OpenMode mode = read);
-  inline bool Close();  // Close is a NOP if not opened
+    // 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 char *szFileName, bool bOverwrite = FALSE,
+              int access = wxS_DEFAULT);
+  bool Open(const char *szFileName, OpenMode mode = read,
+            int access = wxS_DEFAULT);
+  bool Close();  // Close is a NOP if not opened

 
   // assign an existing file descriptor and get it back from wxFile object
   void Attach(int fd) { Close(); m_fd = fd; }
 
   // assign an existing file descriptor and get it back from wxFile object
   void Attach(int fd) { Close(); m_fd = fd; }


@@ -85,7 +97,7 @@ public:
     // returns true on success
   uint Write(const void *pBuf, uint nCount);
     // returns true on success
     // returns true on success
   uint Write(const void *pBuf, uint nCount);
     // returns true on success

-  bool Write(const wxString& str) { return Write(str.c_str(), str.Len()); }
+  bool Write(const wxString& s) { return Write(s.c_str(), s.Len()) != 0; }

     // flush data not yet written
   bool Flush();
 
     // flush data not yet written
   bool Flush();
 


@@ -106,9 +118,9 @@ public:
   bool Eof() const;
     // is an error occured?
   bool Error() const { return m_error; }
   bool Eof() const;
     // is an error occured?
   bool Error() const { return m_error; }

-    
+

   // dtor closes the file if opened
   // dtor closes the file if opened

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

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


@@ -128,7 +140,7 @@ private:
 // file (and close this one) or call Discard() to cancel the modification. If
 // you call neither of them, dtor will call Discard().
 // ----------------------------------------------------------------------------
 // file (and close this one) or call Discard() to cancel the modification. If
 // you call neither of them, dtor will call Discard().
 // ----------------------------------------------------------------------------

-class wxTempFile
+class WXDLLEXPORT wxTempFile

 {
 public:
   // ctors
 {
 public:
   // ctors


@@ -144,8 +156,8 @@ 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); }
-  bool Write(const wxString& str)   { return m_file.Write(str);  }
+  bool Write(const void *p, uint n) { return m_file.Write(p, n) != 0; }
+  bool Write(const wxString& str)   { return m_file.Write(str); }

 
   // different ways to close the file
     // validate changes and delete the old file of name m_strName
 
   // different ways to close the file
     // validate changes and delete the old file of name m_strName


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

-       // __FILEH__
+        // _WX_FILEH__