X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..5fdb6350921035ace3d9619bd2d36f776d0653ef:/include/wx/unix/apptrait.h diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index 8985a93581..cd46c08eb5 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -29,12 +29,30 @@ 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_PROCESS_CALLBACKS + #define wxHAS_GUI_SOCKET_MANAGER +#endif + +#ifdef __DARWIN__ + #define wxHAS_GUI_PROCESS_CALLBACKS +#endif + class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase { public: virtual wxEventLoopBase *CreateEventLoop(); virtual int WaitForChild(wxExecuteData& execData); +#ifdef wxHAS_GUI_PROCESS_CALLBACKS virtual int AddProcessCallback(wxEndProcessData *data, int fd); +#endif #if wxUSE_TIMER virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); #endif @@ -44,7 +62,7 @@ public: #endif #if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS - virtual wxStandardPathsBase& GetStandardPaths(); + virtual wxStandardPaths& GetStandardPaths(); #endif virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const; @@ -58,19 +76,12 @@ public: wxArrayString& desc) const; #endif // __WXGTK20____ -#if defined(__WXDEBUG__) && defined(__WXGTK20__) +#if defined(__WXGTK20__) 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__)) - virtual GSocketManager *GetSocketManager(); +#if wxUSE_SOCKETS && defined(wxHAS_GUI_SOCKET_MANAGER) + virtual wxSocketManager *GetSocketManager(); #endif };