Compilation fixes

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

diff --git a/include/wx/file.h b/include/wx/file.h
index c422a034ef78dfc07beb284afa50908dd540e9a5..50074970d31a887e63798a0a15f72b862e6a35aa 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -95,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


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


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


@@ -169,6 +169,10 @@ public:
  ~wxTempFile();
 
 private:
  ~wxTempFile();
 
 private:

+  // no copy ctor/assignment operator
+  wxTempFile(const wxTempFile&);
+  wxTempFile& operator=(const wxTempFile&);
+

   wxString  m_strName,  // name of the file to replace in Commit()
             m_strTemp;  // temporary file name
   wxFile    m_file;     // the temporary file
   wxString  m_strName,  // name of the file to replace in Commit()
             m_strTemp;  // temporary file name
   wxFile    m_file;     // the temporary file