X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f05114174f40ddbda255ef0ce28caa232b72478a..83a7613b7186bb2597a393b6bcb14166f1e0641d:/include/wx/unix/apptrait.h?ds=inline

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 5a11f9c3e5..d0c5b47bcf 100644
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -35,9 +35,15 @@ public:
 //
 // 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?
+//       by wxX11, should we continue to use GTK/Motif-specific stuff?
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
-    #define wxHAS_GUI_CALLBACKS
+    #define wxHAS_GUI_FDIOMANAGER
+    #define wxHAS_GUI_PROCESS_CALLBACKS
+#endif // ports using wxFDIOManager
+
+#if defined(__WXMAC__)
+    #define wxHAS_GUI_PROCESS_CALLBACKS
+    #define wxHAS_GUI_SOCKET_MANAGER
 #endif
 
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
@@ -45,7 +51,7 @@ class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 public:
     virtual wxEventLoopBase *CreateEventLoop();
     virtual int WaitForChild(wxExecuteData& execData);
-#ifdef wxHAS_GUI_CALLBACKS
+#ifdef wxHAS_GUI_PROCESS_CALLBACKS
     virtual int AddProcessCallback(wxEndProcessData *data, int fd);
 #endif
 #if wxUSE_TIMER
@@ -57,7 +63,7 @@ public:
 #endif
 
 #if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS
-    virtual wxStandardPathsBase& GetStandardPaths();
+    virtual wxStandardPaths& GetStandardPaths();
 #endif
     virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 
@@ -71,13 +77,21 @@ public:
                                                wxArrayString& desc) const;
 #endif // __WXGTK20____
 
-#if defined(__WXDEBUG__) && defined(__WXGTK20__)
+#if defined(__WXGTK20__)
     virtual bool ShowAssertDialog(const wxString& msg);
 #endif
 
-#if wxUSE_SOCKETS && defined(wxHAS_GUI_CALLBACKS)
-    virtual GSocketManager *GetSocketManager();
+#if wxUSE_SOCKETS
+
+#ifdef wxHAS_GUI_SOCKET_MANAGER
+    virtual wxSocketManager *GetSocketManager();
 #endif
+
+#ifdef wxHAS_GUI_FDIOMANAGER
+    virtual wxFDIOManager *GetFDIOManager();
+#endif
+
+#endif // wxUSE_SOCKETS
 };
 
 #endif // wxUSE_GUI