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 dbc56beeb92532a4c20a0714d7407755c4e08276..b767d0a4a09c4ead4b5a6e5e0f4d3ad92b5ec674 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:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEH__


@@ -17,11 +17,9 @@
 #pragma interface "file.h"
 #endif
 
 #pragma interface "file.h"
 #endif
 

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

 
 #if wxUSE_FILE
 
 
 #if wxUSE_FILE
 


@@ -68,7 +66,7 @@ public:
   // ----------------
     // check whether a regular file by this name exists
   static bool Exists(const wxChar *name);
   // ----------------
     // check whether a regular file by this name exists
   static bool Exists(const wxChar *name);

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


@@ -84,7 +82,7 @@ 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 wxChar *szFileName, bool bOverwrite = false,

               int access = wxS_DEFAULT);
   bool Open(const wxChar *szFileName, OpenMode mode = read,
             int access = wxS_DEFAULT);
               int access = wxS_DEFAULT);
   bool Open(const wxChar *szFileName, OpenMode mode = read,
             int access = wxS_DEFAULT);


@@ -97,14 +95,14 @@ public:
 
   // read/write (unbuffered)
     // returns number of bytes read or ofsInvalid on error
 
   // read/write (unbuffered)
     // returns number of bytes read or ofsInvalid on error

-  off_t Read(void *pBuf, off_t nCount);
+  wxFileSize_t Read(void *pBuf, wxFileSize_t nCount);

     // returns the number of bytes written
     // 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);
     // 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
       return Write((const char *) buf, size) == size;
   }
     // flush data not yet written


@@ -112,13 +110,13 @@ public:
 
   // file pointer operations (return ofsInvalid on failure)
     // move ptr ofs bytes related to start/current off_t/end of file
 
   // file pointer operations (return ofsInvalid on failure)
     // move ptr ofs bytes related to start/current off_t/end of file

-  off_t Seek(off_t ofs, wxSeekMode mode = wxFromStart);
+  wxFileSize_t Seek(wxFileOffset ofs, wxSeekMode mode = wxFromStart);

     // move ptr to ofs bytes before the end
     // move ptr to ofs bytes before the end

-  off_t SeekEnd(off_t ofs = 0) { return Seek(ofs, wxFromEnd); }
+  wxFileSize_t SeekEnd(wxFileOffset ofs = 0) { return Seek(ofs, wxFromEnd); }

     // get current off_t
     // get current off_t

-  off_t Tell() const;
+  wxFileSize_t Tell() const;

     // get current file length
     // get current file length

-  off_t Length() const;
+  wxFileSize_t Length() const;

 
   // simple accessors
     // is file opened?
 
   // simple accessors
     // is file opened?


@@ -166,7 +164,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, 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); }
 
   bool Write(const wxString& str, wxMBConv& conv = wxConvUTF8)
     { return m_file.Write(str, conv); }