SetTextColour is gone

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

diff --git a/include/wx/process.h b/include/wx/process.h
index adefc2620a3db0ee8640d775bf648bab1c3a305b..f7071168680ebf16f5dec193b67cc6781e87f0d3 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -12,10 +12,6 @@
 #ifndef _WX_PROCESSH__
 #define _WX_PROCESSH__
 
 #ifndef _WX_PROCESSH__
 #define _WX_PROCESSH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "process.h"
-#endif
-

 #include "wx/event.h"
 
 #if wxUSE_STREAMS
 #include "wx/event.h"
 
 #if wxUSE_STREAMS


@@ -43,7 +39,7 @@ class WXDLLIMPEXP_BASE wxProcess : public wxEvtHandler
 {
 public:
     // kill the process with the given PID
 {
 public:
     // kill the process with the given PID

-    static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM);
+    static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN);

 
     // test if the given process exists
     static bool Exists(int pid);
 
     // test if the given process exists
     static bool Exists(int pid);


@@ -105,12 +101,6 @@ public:
                         wxInputStream *errStream);
 #endif // wxUSE_STREAMS
 
                         wxInputStream *errStream);
 #endif // wxUSE_STREAMS
 

-    // for backwards compatibility only, don't use
-#if WXWIN_COMPATIBILITY_2_2
-    wxProcess(wxEvtHandler *parent, bool redirect)
-        { Init(parent, wxID_ANY, redirect ? wxPROCESS_REDIRECT : wxPROCESS_DEFAULT); }
-#endif // WXWIN_COMPATIBILITY_2_2
-

 protected:
     void Init(wxEvtHandler *parent, int id, int flags);
 
 protected:
     void Init(wxEvtHandler *parent, int id, int flags);
 


@@ -168,10 +158,10 @@ public:
 
 typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
 
 
 typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
 

+#define wxProcessEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func)
+

 #define EVT_END_PROCESS(id, func) \
 #define EVT_END_PROCESS(id, func) \

-   DECLARE_EVENT_TABLE_ENTRY( \
-           wxEVT_END_PROCESS, id, wxID_ANY, \
-           (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxProcessEventFunction, & func ), NULL),
+   wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))

 
 

-#endif
-    // _WX_PROCESSH__
+#endif // _WX_PROCESSH__