X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2804f77d88eb478f85a281b19d87e38cd96e0d0c..661698e54f2bc599dc1a961ffbae08ccdd6b9b97:/include/wx/unix/apptrait.h?ds=sidebyside diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index fe5639731a..f5e5aebbf0 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -22,10 +22,6 @@ public: #if wxUSE_CONSOLE_EVENTLOOP virtual wxEventLoopBase *CreateEventLoop(); #endif // wxUSE_CONSOLE_EVENTLOOP - virtual bool CreateEndProcessPipe(wxExecuteData& execData); - virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd); - virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData); - virtual int WaitForChild(wxExecuteData& execData); #if wxUSE_TIMER virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); #endif @@ -33,13 +29,27 @@ public: #if wxUSE_GUI -class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase +// 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_FDIOMANAGER + #define wxHAS_GUI_PROCESS_CALLBACKS +#endif // ports using wxFDIOManager + +#if defined(__WXMAC__) + #define wxHAS_GUI_PROCESS_CALLBACKS + #define wxHAS_GUI_SOCKET_MANAGER +#endif + +class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase { public: virtual wxEventLoopBase *CreateEventLoop(); - virtual bool CreateEndProcessPipe(wxExecuteData& execData); - virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd); - virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData); virtual int WaitForChild(wxExecuteData& execData); #if wxUSE_TIMER virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); @@ -50,13 +60,9 @@ public: #endif #if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS - virtual wxStandardPathsBase& GetStandardPaths(); + virtual wxStandardPaths& GetStandardPaths(); #endif - virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const; - -#if defined(__WXGTK__) && wxUSE_INTL - virtual void SetLocale(); -#endif // __WXGTK__ + virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const; #ifdef __WXGTK20__ virtual wxString GetDesktopEnvironment() const; @@ -64,20 +70,23 @@ 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 + +#ifdef wxHAS_GUI_SOCKET_MANAGER + virtual wxSocketManager *GetSocketManager(); +#endif + +#ifdef wxHAS_GUI_FDIOMANAGER + virtual wxFDIOManager *GetFDIOManager(); #endif + +#endif // wxUSE_SOCKETS + + virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager(); }; #endif // wxUSE_GUI