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

compilation fixes for separate build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-06-26 01:14:22 +00:00
parent d6045bb81d
commit 2887179b1f
3 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/unix/pipe.h
View File

@@ -94,5 +94,27 @@ private:
int m_fds[2];
};
#if wxUSE_STREAMS
#include "wx/wfstream.h"
// ----------------------------------------------------------------------------
// wxPipeInputStream: stream for reading from a pipe
// ----------------------------------------------------------------------------
class wxPipeInputStream : public wxFileInputStream
{
public:
wxPipeInputStream(int fd) : wxFileInputStream(fd) { }
// return TRUE if the pipe is still opened
bool IsOpened() const { return !Eof(); }
// return TRUE if we have anything to read, don't block
virtual bool CanRead() const;
};
#endif // wxUSE_STREAMS
#endif // _WX_UNIX_PIPE_H_

2
src/common/execcmn.cpp
View File

@@ -81,6 +81,7 @@ inline void wxStreamTempInputBuffer::Init(wxPipeInputStream *stream)
m_stream = stream;
}
inline
void wxStreamTempInputBuffer::Update()
{
if ( m_stream && m_stream->CanRead() )
@@ -104,6 +105,7 @@ void wxStreamTempInputBuffer::Update()
}
}
inline
wxStreamTempInputBuffer::~wxStreamTempInputBuffer()
{
if ( m_buffer )

28
src/unix/utilsunx.cpp
View File

@@ -31,6 +31,14 @@
#include "wx/unix/execute.h"
#if wxUSE_STREAMS
// define this to let wxexec.cpp know that we know what we're doing
#define _WX_USED_BY_WXEXECUTE_
#include "../common/execcmn.cpp"
#endif // wxUSE_STREAMS
#ifdef __WXBASE__
#if defined( __MWERKS__ ) && defined(__MACH__)
@@ -347,22 +355,6 @@ bool wxShutdown(wxShutdownFlags wFlags)
#if wxUSE_STREAMS
// ----------------------------------------------------------------------------
// wxPipeInputStream: stream for reading from a pipe
// ----------------------------------------------------------------------------
class wxPipeInputStream : public wxFileInputStream
{
public:
wxPipeInputStream(int fd) : wxFileInputStream(fd) { }
// return TRUE if the pipe is still opened
bool IsOpened() const { return !Eof(); }
// return TRUE if we have anything to read, don't block
virtual bool CanRead() const;
};
bool wxPipeInputStream::CanRead() const
{
if ( m_lasterror == wxSTREAM_EOF )
@@ -399,10 +391,6 @@ bool wxPipeInputStream::CanRead() const
}
}
// define this to let wxexec.cpp know that we know what we're doing
#define _WX_USED_BY_WXEXECUTE_
#include "../common/execcmn.cpp"
#endif // wxUSE_STREAMS
// ----------------------------------------------------------------------------