add a radio box to select the combobox type (#9845)

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

diff --git a/include/wx/process.h b/include/wx/process.h
index baaea3e33025fbaac6d370fc83240340dfae1409..d49f9f9242743e095aeda3436ec21912d71ea3bc 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        process.h
+// Name:        wx/process.h

 // Purpose:     wxProcess class
 // Author:      Guilhem Lavaux
 // Modified by: Vadim Zeitlin to check error codes, added Detach() method
 // Purpose:     wxProcess class
 // Author:      Guilhem Lavaux
 // Modified by: Vadim Zeitlin to check error codes, added Detach() method


@@ -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


@@ -66,6 +62,9 @@ public:
 
     virtual ~wxProcess();
 
 
     virtual ~wxProcess();
 

+    // get the process ID of the process executed by Open()
+    long GetPid() const { return m_pid; }
+

     // may be overridden to be notified about process termination
     virtual void OnTerminate(int pid, int status);
 
     // may be overridden to be notified about process termination
     virtual void OnTerminate(int pid, int status);
 


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

-    // for backwards compatibility only, don't use
-#if WXWIN_COMPATIBILITY_2_2
-    wxDEPRECATED( wxProcess(wxEvtHandler *parent, bool redirect) );
-#endif // WXWIN_COMPATIBILITY_2_2
-

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

+    void SetPid(long pid) { m_pid = pid; }

 
     int m_id;
 
     int m_id;

+    long m_pid;

 
 #if wxUSE_STREAMS
     // these streams are connected to stdout, stderr and stdin of the child
 
 #if wxUSE_STREAMS
     // these streams are connected to stdout, stderr and stdin of the child


@@ -134,9 +130,7 @@ protected:
 // wxProcess events
 // ----------------------------------------------------------------------------
 
 // wxProcess events
 // ----------------------------------------------------------------------------
 

-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, 440)
-END_DECLARE_EVENT_TYPES()
+extern WXDLLIMPEXP_BASE const wxEventType wxEVT_END_PROCESS;

 
 class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent
 {
 
 class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent
 {


@@ -168,7 +162,7 @@ public:
 typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
 
 #define wxProcessEventHandler(func) \
 typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
 
 #define wxProcessEventHandler(func) \

-    (wxObjectEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func)

 
 #define EVT_END_PROCESS(id, func) \
    wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))
 
 #define EVT_END_PROCESS(id, func) \
    wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))