projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
attempts to fix wxMimeTypesManager mess: many bugs (entries priority, memory leaks...
[wxWidgets.git]
/
include
/
wx
/
file.h
diff --git
a/include/wx/file.h
b/include/wx/file.h
index 038b578e33f76d0007bff11ea946c12dd0231ef6..0c644bfe03f273c48cee86a2a0fe97d4204a84f2 100644
(file)
--- a/
include/wx/file.h
+++ b/
include/wx/file.h
@@
-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
// Purpose: wxFile - encapsulates low-level "file descriptor"
// wxTempFile - safely replace the old file
// Author: Vadim Zeitlin
@@
-10,8
+10,8
@@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#ifndef
_
_FILEH__
-#define
_
_FILEH__
+#ifndef
_WX
_FILEH__
+#define
_WX
_FILEH__
#ifdef __GNUG__
#pragma interface "file.h"
#ifdef __GNUG__
#pragma interface "file.h"
@@
-22,6
+22,8
@@
#include "wx/filefn.h"
#endif
#include "wx/filefn.h"
#endif
+#if wxUSE_FILE
+
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
@@
-56,7
+58,7
@@
public:
// more file constants
// -------------------
// opening mode
// more file constants
// -------------------
// opening mode
- enum OpenMode { read, write, read_write, write_append };
+ enum OpenMode { read, write, read_write, write_append
, write_excl
};
// standard values for file descriptor
enum { fd_invalid = -1, fd_stdin, fd_stdout, fd_stderr };
// standard values for file descriptor
enum { fd_invalid = -1, fd_stdin, fd_stdout, fd_stderr };
@@
-94,10
+96,15
@@
public:
// read/write (unbuffered)
// returns number of bytes read or ofsInvalid on error
off_t Read(void *pBuf, off_t nCount);
// read/write (unbuffered)
// returns number of bytes read or ofsInvalid on error
off_t Read(void *pBuf, off_t nCount);
- // returns t
rue on success
+ // returns t
he number of bytes written
size_t Write(const void *pBuf, size_t nCount);
// returns true on success
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, wxMBConv& conv = wxConvLibc)
+ {
+ const wxWX2MBbuf buf = s.mb_str(conv);
+ size_t size = strlen(buf);
+ return Write((const char *) buf, size) == size;
+ }
// flush data not yet written
bool Flush();
// flush data not yet written
bool Flush();
@@
-116,11
+123,11
@@
public:
bool IsOpened() const { return m_fd != fd_invalid; }
// is end of file reached?
bool Eof() const;
bool IsOpened() const { return m_fd != fd_invalid; }
// is end of file reached?
bool Eof() const;
- //
i
s an error occured?
+ //
ha
s an error occured?
bool Error() const { return m_error; }
// dtor closes the file if opened
bool Error() const { return m_error; }
// dtor closes the file if opened
- ~wxFile()
;
+ ~wxFile()
{ Close(); }
private:
// copy ctor and assignment operator are private because
private:
// copy ctor and assignment operator are private because
@@
-157,7
+164,7
@@
public:
// 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; }
// 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 wxString& str
) { return m_file.Write(str
); }
+ bool Write(const wxString& str
, wxMBConv& conv = wxConvLibc) { return m_file.Write(str, conv
); }
// different ways to close the file
// validate changes and delete the old file of name m_strName
// different ways to close the file
// validate changes and delete the old file of name m_strName
@@
-178,5
+185,6
@@
private:
wxFile m_file; // the temporary file
};
wxFile m_file; // the temporary file
};
-#endif
- // _WX_FILEH__
+#endif // wxUSE_FILE
+
+#endif // _WX_FILEH__