X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f5c66294a280b8408a4e1464f6468bb97d141b2..e276acb530f41f0b87c4576c0215201a8a767dff:/include/wx/unix/apptrait.h

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index ab34f3ada9..d29686af57 100644
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -22,7 +22,6 @@ public:
 #if wxUSE_CONSOLE_EVENTLOOP
     virtual wxEventLoopBase *CreateEventLoop();
 #endif // wxUSE_CONSOLE_EVENTLOOP
-    virtual int WaitForChild(wxExecuteData& execData);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
@@ -30,11 +29,30 @@ public:
 
 #if wxUSE_GUI
 
-class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase
+// GTK+ and Motif integrate sockets and child processes monitoring directly in
+// their main loop, the other Unix ports do it at wxEventLoop level and so use
+// the non-GUI traits and don't need anything here
+//
+// TODO: Should we use XtAddInput() for wxX11 too? Or, vice versa, if there is
+//       no advantage in doing this compared to the generic way currently used
+//       by wxX11, should we continue to use GTK/Motif- specific stuff?
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+    #define wxHAS_GUI_PROCESS_CALLBACKS
+    #define wxHAS_GUI_SOCKET_MANAGER
+#endif
+
+#ifdef __DARWIN__
+    #define wxHAS_GUI_PROCESS_CALLBACKS
+#endif
+
+class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
     virtual wxEventLoopBase *CreateEventLoop();
     virtual int WaitForChild(wxExecuteData& execData);
+#ifdef wxHAS_GUI_PROCESS_CALLBACKS
+    virtual int AddProcessCallback(wxEndProcessData *data, int fd);
+#endif
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
@@ -62,15 +80,8 @@ public:
     virtual bool ShowAssertDialog(const wxString& msg);
 #endif
 
-    // GTK+ and Motif integrate sockets directly in their main loop, the other
-    // Unix ports do it at wxEventLoop level
-    //
-    // TODO: Should we use XtAddInput() for wxX11 too? Or, vice versa, if there
-    //       is no advantage in doing this compared to the generic way
-    //       currently used by wxX11, should we continue to use GTK/Motif-
-    //       specific stuff?
-#if wxUSE_SOCKETS && (defined(__WXGTK__) || defined(__WXMOTIF__))
-    virtual GSocketManager *GetSocketManager();
+#if wxUSE_SOCKETS && defined(wxHAS_GUI_SOCKET_MANAGER)
+    virtual wxSocketManager *GetSocketManager();
 #endif
 };