X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5815e95907dbecbac1e6d4d9cf3290f8d36eca48..2a45803fc3877afd0ae3ce356dfe216505165882:/include/wx/unix/apptrait.h diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index 59cb7595cc..04109204e9 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -36,7 +36,12 @@ 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? -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) + #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 @@ -62,10 +67,6 @@ public: #endif virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const; -#if defined(__WXGTK__) && wxUSE_INTL - virtual void SetLocale(); -#endif // __WXGTK__ - #ifdef __WXGTK20__ virtual wxString GetDesktopEnvironment() const; virtual wxString GetStandardCmdLineOptions(wxArrayString& names, @@ -76,9 +77,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