From a0f4d36895556e3054e2256cb5f1787cc9fcf75c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 11 Apr 2008 12:59:22 +0000 Subject: [PATCH] GetSocketManager() has no GUI-specific version under Darwin finally git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/unix/apptrait.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index c57e94954a..c09cfc48de 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -36,8 +36,13 @@ 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(__DARWIN__) - #define wxHAS_GUI_CALLBACKS +#if defined(__WXGTK__) || defined(__WXMOTIF__) + #define wxHAS_GUI_PROCESS_CALLBACKS + #define wxHAS_GUI_SOCKET_MANAGER +#endif + +#ifdef __DARWIN__ + #define wxHAS_GUI_SOCKET_MANAGER #endif class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase @@ -45,7 +50,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 @@ -75,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 }; -- 2.45.2