1. wxProcess changes to make capturing subprocess output easier (and more
reliable), now works in both sync and async modes 2. wxSafeYieldBug() corrected, wxWindowDisabler which is now used in it added and documented 3. exec sample updated to illustrate capturing the subprocess output 4. wxStreamBase::IsOk() added 5. wxInputStream::Eof() added and non-blocking Eof() implementation in wxPipeInputStream used by wxExecute git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -38,12 +38,8 @@ WXDLLEXPORT wxOutputStream& wxEndL(wxOutputStream& o_stream);
|
||||
// wxStream: base classes
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
#define wxStream_NOERROR wxSTREAM_NOERROR
|
||||
#define wxStream_EOF wxSTREAM_EOF
|
||||
#define wxStream_WRITE_ERR wxSTREAM_WRITE_ERROR
|
||||
#define wxStream_READ_ERR wxSTREAM_READ_ERROR
|
||||
|
||||
typedef enum {
|
||||
typedef enum
|
||||
{
|
||||
wxSTREAM_NO_ERROR = 0,
|
||||
wxSTREAM_NO_ERR = wxSTREAM_NO_ERROR,
|
||||
wxSTREAM_NOERROR = wxSTREAM_NO_ERROR,
|
||||
@@ -58,14 +54,24 @@ typedef enum {
|
||||
|
||||
} wxStreamError;
|
||||
|
||||
// compatibility
|
||||
#define wxStream_NOERROR wxSTREAM_NOERROR
|
||||
#define wxStream_EOF wxSTREAM_EOF
|
||||
#define wxStream_WRITE_ERR wxSTREAM_WRITE_ERROR
|
||||
#define wxStream_READ_ERR wxSTREAM_READ_ERROR
|
||||
|
||||
class WXDLLEXPORT wxStreamBase
|
||||
{
|
||||
public:
|
||||
wxStreamBase();
|
||||
virtual ~wxStreamBase();
|
||||
|
||||
bool operator!() const { return (LastError() != wxSTREAM_NOERROR); }
|
||||
// error testing
|
||||
wxStreamError LastError() const { return m_lasterror; }
|
||||
wxStreamError GetLastError() const { return m_lasterror; }
|
||||
bool IsOk() const { return LastError() == wxSTREAM_NOERROR; }
|
||||
bool operator!() const { return LastError() != wxSTREAM_NOERROR; }
|
||||
|
||||
virtual size_t GetSize() const { return ~((size_t)0); }
|
||||
size_t StreamSize() const { return GetSize(); }
|
||||
|
||||
@@ -87,6 +93,9 @@ public:
|
||||
wxInputStream();
|
||||
virtual ~wxInputStream();
|
||||
|
||||
// is the stream at EOF?
|
||||
virtual bool Eof() const;
|
||||
|
||||
// IO functions
|
||||
virtual char Peek();
|
||||
char GetC();
|
||||
|
Reference in New Issue
Block a user