X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25f49256ac6682a358e461036ec64aad1b26e353..40df8a51f2d922237dd11a5ff14532ea744027b7:/include/wx/unix/apptrait.h?ds=sidebyside diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index cd46c08eb5..d0c5b47bcf 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -35,14 +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_FDIOMANAGER #define wxHAS_GUI_PROCESS_CALLBACKS - #define wxHAS_GUI_SOCKET_MANAGER -#endif +#endif // ports using wxFDIOManager -#ifdef __DARWIN__ +#if defined(__WXMAC__) #define wxHAS_GUI_PROCESS_CALLBACKS + #define wxHAS_GUI_SOCKET_MANAGER #endif class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase @@ -80,9 +81,17 @@ public: virtual bool ShowAssertDialog(const wxString& msg); #endif -#if wxUSE_SOCKETS && defined(wxHAS_GUI_SOCKET_MANAGER) +#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