Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxFileSize_t, changed types of wxFile methods/parameters once again

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-10-15 00:01:00 +00:00
parent a752b8c4e0
commit 93e0db9a80
5 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/file.h
View File

@@ -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
@@ -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); }

8
include/wx/filefn.h
View File

@@ -131,6 +131,7 @@ enum wxSeekMode
// Implemented in filefnwce.cpp
#if defined( __WXWINCE__)
typedef __int64 wxFileOffset;
typedef unsigned __int64 wxFileSize_t;
#define wxFileOffsetFmtSpec _("I64")
int wxOpen(const wxChar *filename, int oflag, int WXUNUSED(pmode));
int wxAccess(const wxChar *name, int WXUNUSED(how));
@@ -195,9 +196,11 @@ enum wxSeekMode
#if wxHAS_HUGE_FILES
typedef wxLongLong_t wxFileOffset;
typedef unsigned wxLongLong_t wxFileSize_t;
#define wxFileOffsetFmtSpec wxLongLongFmtSpec
#else
typedef off_t wxFileOffset;
typedef unsigned off_t wxFileSize_t;
#define wxFileOffsetFmtSpec _("")
#endif
@@ -319,6 +322,7 @@ enum wxSeekMode
#undef wxHAS_HUGE_FILES
#else // Unix platforms using configure
typedef off_t wxFileOffset;
typedef unsigned off_t wxFileSize_t;
#ifdef _LARGE_FILES
#define wxFileOffsetFmtSpec wxLongLongFmtSpec
#else
@@ -360,9 +364,9 @@ enum wxSeekMode
// VisualAge C++ V4.0 cannot have any external linkage const decs
// in headers included by more than one primary source
//
extern const wxFileOffset wxInvalidOffset;
extern const wxFileSize_t wxInvalidOffset;
#else
const wxFileOffset wxInvalidOffset = (wxFileOffset)-1;
const wxFileSize_t wxInvalidOffset = (wxFileSize_t)-1;
#endif
// ----------------------------------------------------------------------------