Compile fix for prop.

[wxWidgets.git] / src / common / process.cpp

diff --git a/src/common/process.cpp b/src/common/process.cpp
index e57f66688bc3c0d3e8a3dd9c06a342a569dbfa87..0e9769d95e62a78a350953cf83a6a9fbeb9bfb45 100644 (file)
--- a/src/common/process.cpp
+++ b/src/common/process.cpp
@@ -47,13 +47,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
 // wxProcess creation
 // ----------------------------------------------------------------------------
 
-void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect)
+void wxProcess::Init(wxEvtHandler *parent, int id, int flags)
 {
     if ( parent )
         SetNextHandler(parent);
 
     m_id         = id;
-    m_redirect   = redirect;
+    m_redirect   = (flags & wxPROCESS_REDIRECT) != 0;
 
 #if wxUSE_STREAMS
     m_inputStream  = NULL;
@@ -62,6 +62,21 @@ void wxProcess::Init(wxEvtHandler *parent, int id, bool redirect)
 #endif // wxUSE_STREAMS
 }
 
+/* static */
+wxProcess *wxProcess::Open(const wxString& cmd, int flags)
+{
+    wxASSERT_MSG( !(flags & wxEXEC_SYNC), wxT("wxEXEC_SYNC should not be used." ));
+    wxProcess *process = new wxProcess(wxPROCESS_REDIRECT);
+    if ( !wxExecute(cmd, flags, process) )
+    {
+        // couldn't launch the process
+        delete process;
+        return NULL;
+    }
+
+    return process;
+}
+
 // ----------------------------------------------------------------------------
 // wxProcess termination
 // ----------------------------------------------------------------------------
@@ -105,6 +120,28 @@ void wxProcess::SetPipeStreams(wxInputStream *inputSstream,
     m_outputStream = outputStream;
 }
 
+// these are implemented in platform-dependent (and correct!) way under MSW and
+// Unix but we still have to provide these dummy versions for the other
+// platforms here
+#if !defined(__WIN32__) && !defined(__UNIX_LIKE__)
+
+bool wxProcess::IsInputOpened() const
+{
+    return m_inputStream != NULL;
+}
+
+bool wxProcess::IsInputAvailable() const
+{
+    return m_inputStream && !m_inputStream->Eof();
+}
+
+bool wxProcess::IsErrorAvailable() const
+{
+    return m_errorStream && !m_errorStream->Eof();
+}
+
+#endif // !Win32 && !Unix
+
 #endif // wxUSE_STREAMS
 
 // ----------------------------------------------------------------------------
@@ -123,7 +160,7 @@ wxKillError wxProcess::Kill(int pid, wxSignal sig)
 /* static */
 bool wxProcess::Exists(int pid)
 {
-    switch ( wxProcess::Kill(pid, wxSIGNONE) )
+    switch ( Kill(pid, wxSIGNONE) )
     {
         case wxKILL_OK:
         case wxKILL_ACCESS_DENIED: