X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13d4419b86d028b3e7e32b0f94cc45c40dd9551c..f9bb777f88b5c93054e0ba0c2f1d5d9186f97a33:/include/wx/unix/apptrait.h diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index ca2570d55e..0161332ce4 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -37,7 +37,12 @@ public: // 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_CALLBACKS + #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 @@ -45,8 +50,9 @@ 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 virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); #endif @@ -74,7 +80,7 @@ public: virtual bool ShowAssertDialog(const wxString& msg); #endif -#if wxUSE_SOCKETS && defined(wxHAS_GUI_CALLBACKS) +#if wxUSE_SOCKETS && defined(wxHAS_GUI_SOCKET_MANAGER) virtual GSocketManager *GetSocketManager(); #endif };