Fix for deprecated constructor issues, setting a function without a body as inline...

[wxWidgets.git] / include / wx / unix / apptbase.h

diff --git a/include/wx/unix/apptbase.h b/include/wx/unix/apptbase.h
index 50f30040f8e3cd594cdac5e1a6ef6ce261751384..4ec132c140f46e01f2cee64691073f283fc474e9 100644 (file)
--- a/include/wx/unix/apptbase.h
+++ b/include/wx/unix/apptbase.h
@@ -12,8 +12,8 @@
 #ifndef _WX_UNIX_APPTBASE_H_
 #define _WX_UNIX_APPTBASE_H_
 
 #ifndef _WX_UNIX_APPTBASE_H_
 #define _WX_UNIX_APPTBASE_H_
 

+struct wxEndProcessData;

 struct wxExecuteData;
 struct wxExecuteData;

-class wxPipe;

 
 // ----------------------------------------------------------------------------
 // wxAppTraits: the Unix version adds extra hooks needed by Unix code
 
 // ----------------------------------------------------------------------------
 // wxAppTraits: the Unix version adds extra hooks needed by Unix code


@@ -25,36 +25,29 @@ public:
     // wxExecute() support methods
     // ---------------------------
 
     // wxExecute() support methods
     // ---------------------------
 

-    // called before starting the child process and creates the pipe used for
-    // detecting the process termination asynchronously in GUI, does nothing in
-    // wxBase
-    //
-    // if it returns false, we should return from wxExecute() with an error
-    virtual bool CreateEndProcessPipe(wxExecuteData& execData) = 0;
-
-    // test if the given descriptor is the end of the pipe create by the
-    // function above
-    virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd) = 0;
-
-    // ensure that the write end of the pipe is not closed by wxPipe dtor
-    virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData) = 0;
-

     // wait for the process termination, return whatever wxExecute() must
     // return
     // wait for the process termination, return whatever wxExecute() must
     // return

-    virtual int WaitForChild(wxExecuteData& execData) = 0;
-
-
-    // wxThread helpers
-    // ----------------
+    //
+    // base class implementation handles all cases except wxEXEC_SYNC without
+    // wxEXEC_NOEVENTS one which is implemented at the GUI level
+    virtual int WaitForChild(wxExecuteData& execData);
+
+    // integrate the monitoring of the given fd with the port-specific event
+    // loop: when this fd, which corresponds to a dummy pipe opened between the
+    // parent and child processes, is closed by the child, the parent is
+    // notified about this via a call to wxHandleProcessTermination() function
+    //
+    // the default implementation uses wxFDIODispatcher and so is suitable for
+    // the console applications or ports which don't have any specific event
+    // loop
+    virtual int AddProcessCallback(wxEndProcessData *data, int fd);

 
 

-    // TODO

 
 

-#if wxUSE_SOCKETS
-    // returns the select()-based socket manager for console applications which
-    // is also used by some ports (wxX11, wxDFB) in the GUI build (hence it is
-    // here and not in wxConsoleAppTraits)
-    virtual GSocketManager *GetSocketManager();
-#endif
+protected:
+    // a helper for the implementation of WaitForChild() in wxGUIAppTraits:
+    // checks the streams used for redirected IO in execData and returns true
+    // if there is any activity in them
+    bool CheckForRedirectedIO(wxExecuteData& execData);

 };
 
 #endif // _WX_UNIX_APPTBASE_H_
 };
 
 #endif // _WX_UNIX_APPTBASE_H_