use wxALIGN_LEFT/CENTRE/RIGHT instead of wxTE_XXX to avoid problems with the latter...

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

diff --git a/interface/wx/process.h b/interface/wx/process.h
index 1401717d767a6e04ab8c220a86649f0d50ce0f79..c748d6440e9b4caf7c896dab870d633e053d2c44 100644 (file)
--- a/interface/wx/process.h
+++ b/interface/wx/process.h
@@ -44,7 +44,6 @@ enum wxKillError
 
 /**
     @class wxProcess
-    @wxheader{process.h}
 
     The objects of this class are used in conjunction with the ::wxExecute() function.
     When a wxProcess object is passed to ::wxExecute(), its OnTerminate() virtual method
@@ -101,7 +100,7 @@ public:
     /**
         Destroys the wxProcess object.
     */
-    ~wxProcess();
+    virtual ~wxProcess();
 
     /**
         Closes the output stream (the one connected to the stdin of the child
@@ -203,7 +202,7 @@ public:
 
         @see Exists(), wxKill(), @ref page_samples_exec "Exec sample"
     */
-    static wxKillError Kill(int pid, wxSignal signal = wxSIGNONE,
+    static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM,
                             int flags = wxKILL_NOCHILDREN);
 
     /**
@@ -215,7 +214,7 @@ public:
         @param status
             The exit code of the process.
     */
-    void OnTerminate(int pid, int status);
+    virtual void OnTerminate(int pid, int status);
 
     /**
         This static method replaces the standard @c popen() function: it launches
@@ -258,21 +257,21 @@ public:
 
 /**
     @class wxProcessEvent
-    @wxheader{process.h}
 
-    A process event is sent when a process is terminated.
+    A process event is sent to the wxEvtHandler specified to wxProcess
+    when a process is terminated.
 
     @beginEventTable{wxProcessEvent}
     @event{EVT_END_PROCESS(id, func)}
-           Process a @c wxEVT_END_PROCESS event. @a id is the identifier of the process
-           object (the id passed to the wxProcess constructor) or a window to receive
-           the event.
+        Process a @c wxEVT_END_PROCESS event. @a id is the identifier of the process
+        object (the id passed to the wxProcess constructor) or a window to receive
+        the event.
     @endEventTable
 
     @library{wxbase}
     @category{events}
 
-    @see wxProcess, @ref overview_eventhandling
+    @see wxProcess, @ref overview_events
 */
 class wxProcessEvent : public wxEvent
 {
@@ -292,6 +291,6 @@ public:
     /**
         Returns the process id.
     */
-    int GetPid() const;
+    int GetPid();
 };