From: Vadim Zeitlin Date: Thu, 10 Apr 2008 10:44:06 +0000 (+0000) Subject: only declare AddProcessCallback for wxMotif and wxGTK X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/13d4419b86d028b3e7e32b0f94cc45c40dd9551c only declare AddProcessCallback for wxMotif and wxGTK git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index 8985a93581..ca2570d55e 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -29,11 +29,23 @@ public: #if wxUSE_GUI +// GTK+ and Motif integrate sockets and child processes monitoring directly in +// their main loop, the other Unix ports do it at wxEventLoop level and so use +// the non-GUI traits and don't need anything here +// +// 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__) + #define wxHAS_GUI_CALLBACKS +#endif + class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase { public: virtual wxEventLoopBase *CreateEventLoop(); virtual int WaitForChild(wxExecuteData& execData); +#ifdef wxHAS_GUI_CALLBACKS virtual int AddProcessCallback(wxEndProcessData *data, int fd); #if wxUSE_TIMER virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); @@ -62,14 +74,7 @@ public: virtual bool ShowAssertDialog(const wxString& msg); #endif - // GTK+ and Motif integrate sockets directly in their main loop, the other - // Unix ports do it at wxEventLoop level - // - // 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 wxUSE_SOCKETS && (defined(__WXGTK__) || defined(__WXMOTIF__)) +#if wxUSE_SOCKETS && defined(wxHAS_GUI_CALLBACKS) virtual GSocketManager *GetSocketManager(); #endif };