wxBitmapButton doesn't need own DoGetBestSize, wxControl's one works (fixes sizing...

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

diff --git a/include/wx/file.h b/include/wx/file.h
index 15b35b8d83776ec0cfdc1e74d5a1764c2bbb8f1d..b767d0a4a09c4ead4b5a6e5e0f4d3ad92b5ec674 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -95,14 +95,14 @@ public:
 
   // read/write (unbuffered)
     // returns number of bytes read or ofsInvalid on error
-  size_t Read(void *pBuf, size_t nCount);
+  wxFileSize_t Read(void *pBuf, wxFileSize_t nCount);
     // returns the number of bytes written
-  size_t Write(const void *pBuf, size_t nCount);
+  wxFileSize_t Write(const void *pBuf, wxFileSize_t nCount);
     // returns true on success
   bool Write(const wxString& s, wxMBConv& conv = wxConvUTF8)
   {
       const wxWX2MBbuf buf = s.mb_str(conv);
-      size_t size = strlen(buf);
+      wxFileSize_t size = strlen(buf);
       return Write((const char *) buf, size) == size;
   }
     // flush data not yet written
@@ -110,13 +110,13 @@ public:
 
   // file pointer operations (return ofsInvalid on failure)
     // move ptr ofs bytes related to start/current off_t/end of file
-  wxFileOffset Seek(wxFileOffset ofs, wxSeekMode mode = wxFromStart);
+  wxFileSize_t Seek(wxFileOffset ofs, wxSeekMode mode = wxFromStart);
     // move ptr to ofs bytes before the end
-  wxFileOffset SeekEnd(wxFileOffset ofs = 0) { return Seek(ofs, wxFromEnd); }
+  wxFileSize_t SeekEnd(wxFileOffset ofs = 0) { return Seek(ofs, wxFromEnd); }
     // get current off_t
-  wxFileOffset Tell() const;
+  wxFileSize_t Tell() const;
     // get current file length
-  wxFileOffset Length() const;
+  wxFileSize_t Length() const;
 
   // simple accessors
     // is file opened?
@@ -164,7 +164,7 @@ public:
   bool IsOpened() const { return m_file.IsOpened(); }
 
   // 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) != 0; }
+  bool Write(const void *p, wxFileSize_t n) { return m_file.Write(p, n) == n; }
   bool Write(const wxString& str, wxMBConv& conv = wxConvUTF8)
     { return m_file.Write(str, conv); }