changed choice to properly inherit from wxChoiceBase , added msg compatible calls...

[wxWidgets.git] / include / wx / process.h

diff --git a/include/wx/process.h b/include/wx/process.h
index f88b6a85c7b4816e6310727f5bc6f753e6ab4c9b..ddf87b3a0409fdd2a9a527ee16645301fee4e95e 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -19,34 +19,16 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/event.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/event.h"

-#include "wx/stream.h"

 
 

-// Process Event handling
-class WXDLLEXPORT wxProcessEvent : public wxEvent
-{
-DECLARE_DYNAMIC_CLASS(wxProcessEvent)
-
-public:
-    wxProcessEvent(int id = 0, int pid = 0, int exitcode = 0) : wxEvent(id)
-    {
-        m_eventType = wxEVT_END_PROCESS;
-        m_pid = pid;
-        m_exitcode = exitcode;
-    }
-
-    // accessors
-        // PID of process which terminated
-    int GetPid() { return m_pid; }
-
-        // the exit code
-    int GetExitCode() { return m_exitcode; }
-
-public:
-    int m_pid, m_exitcode;
-};
+#if wxUSE_STREAMS
+    #include "wx/stream.h"
+#endif

 
 

+// ----------------------------------------------------------------------------

 // A wxProcess object should be passed to wxExecute - than its OnTerminate()
 // function will be called when the process terminates.
 // A wxProcess object should be passed to wxExecute - than its OnTerminate()
 // function will be called when the process terminates.

+// ----------------------------------------------------------------------------
+

 class WXDLLEXPORT wxProcess : public wxEvtHandler
 {
 DECLARE_DYNAMIC_CLASS(wxProcess)
 class WXDLLEXPORT wxProcess : public wxEvtHandler
 {
 DECLARE_DYNAMIC_CLASS(wxProcess)


@@ -72,27 +54,70 @@ public:
     // before the process it started terminates
     void Detach();
 
     // before the process it started terminates
     void Detach();
 

+#if wxUSE_STREAMS

     // Pipe handling
     wxInputStream *GetInputStream() const { return m_inputStream; }
     // Pipe handling
     wxInputStream *GetInputStream() const { return m_inputStream; }

+    wxInputStream *GetErrorStream() const { return m_errorStream; }

     wxOutputStream *GetOutputStream() const { return m_outputStream; }
 
     wxOutputStream *GetOutputStream() const { return m_outputStream; }
 

+    // close the output stream indicating that nothing more will be written
+    void CloseOutput() { delete m_outputStream; m_outputStream = NULL; }
+

     // implementation only (for wxExecute)
     // implementation only (for wxExecute)

-    void SetPipeStreams(wxInputStream *inStream, wxOutputStream *outStream);
+    void SetPipeStreams(wxInputStream *inStream,
+                        wxOutputStream *outStream,
+                        wxInputStream *errStream);
+#endif // wxUSE_STREAMS

 
 protected:
     void Init(wxEvtHandler *parent, int id, bool redirect);
 
     int m_id;
 
 
 protected:
     void Init(wxEvtHandler *parent, int id, bool redirect);
 
     int m_id;
 

-    wxInputStream  *m_inputStream;
+#if wxUSE_STREAMS
+    wxInputStream  *m_inputStream,
+                   *m_errorStream;

     wxOutputStream *m_outputStream;
     wxOutputStream *m_outputStream;

+#endif // wxUSE_STREAMS

 
     bool m_redirect;
 };
 
 
     bool m_redirect;
 };
 

+// ----------------------------------------------------------------------------
+// wxProcess events
+// ----------------------------------------------------------------------------
+
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_END_PROCESS, 440)
+END_DECLARE_EVENT_TYPES()
+
+class WXDLLEXPORT wxProcessEvent : public wxEvent
+{
+public:
+    wxProcessEvent(int id = 0, int pid = 0, int exitcode = 0) : wxEvent(id)
+    {
+        m_eventType = wxEVT_END_PROCESS;
+        m_pid = pid;
+        m_exitcode = exitcode;
+    }
+
+    // accessors
+        // PID of process which terminated
+    int GetPid() { return m_pid; }
+
+        // the exit code
+    int GetExitCode() { return m_exitcode; }
+
+public:
+    int m_pid, m_exitcode;
+
+    DECLARE_DYNAMIC_CLASS(wxProcessEvent)
+};
+

 typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&);
 
 typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&);
 

-#define EVT_END_PROCESS(id, func) { wxEVT_END_PROCESS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxProcessEventFunction) & func, NULL},
+#define EVT_END_PROCESS(id, func) \
+   DECLARE_EVENT_TABLE_ENTRY( wxEVT_END_PROCESS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxProcessEventFunction) & func, NULL),

 
 #endif
     // _WX_PROCESSH__
 
 #endif
     // _WX_PROCESSH__