Added event handler macro

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

diff --git a/include/wx/file.h b/include/wx/file.h
index d3dd07ea3a5af02f2374d3cf8b2ebefc5ef675e9..631f12c3c1d944e42ac109914b5bac014fed6557 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -63,10 +63,10 @@ public:
   // static functions
   // ----------------
     // check whether a regular file by this name exists
   // static functions
   // ----------------
     // check whether a regular file by this name exists

-  static bool Exists(const wxChar *name);
+  static bool Exists(const wxString& name);

     // check whether we can access the given file in given mode
     // (only read and write make sense here)
     // 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);
+  static bool Access(const wxString& name, OpenMode mode);

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


@@ -80,9 +80,9 @@ 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 wxString& fileName, bool bOverwrite = false,

               int access = wxS_DEFAULT);
               int access = wxS_DEFAULT);

-  bool Open(const wxChar *szFileName, OpenMode mode = read,
+  bool Open(const wxString& fileName, OpenMode mode = read,

             int access = wxS_DEFAULT);
   bool Close();  // Close is a NOP if not opened
 
             int access = wxS_DEFAULT);
   bool Close();  // Close is a NOP if not opened
 


@@ -97,7 +97,7 @@ public:
     // 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

-  bool Write(const wxString& s, const wxMBConv& conv = wxConvUTF8);
+  bool Write(const wxString& s, const wxMBConv& conv = wxMBConvUTF8());

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


@@ -167,7 +167,7 @@ public:
 
   // I/O (both functions return true on success, false on failure)
   bool Write(const void *p, size_t n) { return m_file.Write(p, n) == n; }
 
   // I/O (both functions return true on success, false on failure)
   bool Write(const void *p, size_t n) { return m_file.Write(p, n) == n; }

-  bool Write(const wxString& str, const wxMBConv& conv = wxConvUTF8)
+  bool Write(const wxString& str, const wxMBConv& conv = wxMBConvUTF8())

     { return m_file.Write(str, conv); }
 
   // different ways to close the file
     { return m_file.Write(str, conv); }
 
   // different ways to close the file