1. new wxFFile class - as wxFile but uses fopen/fread/fseek... instead of
open/read/seek... 2. wxTextCtrlBase appears, several bug fixes in MSW wxTextCtrl and made LoadFile() behave in the same way under GTK and MSW (fixed it for MSW too) 3. Corrected the sash position calculation in sashwin.cpp - seems to work now but I wonder how it could ever work before? 4. new, tmake generated, MSW makefiles. They probably don't work - will fix them as soon as people start complaining. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: file.cpp
|
||||
// Name: file.h
|
||||
// Purpose: wxFile - encapsulates low-level "file descriptor"
|
||||
// wxTempFile - safely replace the old file
|
||||
// Author: Vadim Zeitlin
|
||||
@@ -10,8 +10,8 @@
|
||||
// Licence: wxWindows license
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef __FILEH__
|
||||
#define __FILEH__
|
||||
#ifndef _WX_FILEH__
|
||||
#define _WX_FILEH__
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma interface "file.h"
|
||||
@@ -96,10 +96,14 @@ public:
|
||||
// read/write (unbuffered)
|
||||
// returns number of bytes read or ofsInvalid on error
|
||||
off_t Read(void *pBuf, off_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) { return Write(s.c_str(), s.Len()*sizeof(wxChar)) != 0; }
|
||||
bool Write(const wxString& s)
|
||||
{
|
||||
size_t size = s.Len()*sizeof(wxChar);
|
||||
return Write(s.c_str(), size) == size;
|
||||
}
|
||||
// flush data not yet written
|
||||
bool Flush();
|
||||
|
||||
@@ -118,11 +122,11 @@ public:
|
||||
bool IsOpened() const { return m_fd != fd_invalid; }
|
||||
// is end of file reached?
|
||||
bool Eof() const;
|
||||
// is an error occured?
|
||||
// has an error occured?
|
||||
bool Error() const { return m_error; }
|
||||
|
||||
// dtor closes the file if opened
|
||||
~wxFile();
|
||||
~wxFile() { Close(); }
|
||||
|
||||
private:
|
||||
// copy ctor and assignment operator are private because
|
||||
@@ -180,7 +184,6 @@ private:
|
||||
wxFile m_file; // the temporary file
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif // wxUSE_FILE
|
||||
|
||||
#endif
|
||||
// _WX_FILEH__
|
||||
#endif // _WX_FILEH__
|
||||
|
Reference in New Issue
Block a user