X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0f4d36895556e3054e2256cb5f1787cc9fcf75c..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/unix/apptrait.h diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index c09cfc48de..3fbe4d82da 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 23.06.2003 -// RCS-ID: $Id$ // Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -35,13 +34,14 @@ 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? +// 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 - #define wxHAS_GUI_SOCKET_MANAGER -#endif +#endif // ports using wxFDIOManager -#ifdef __DARWIN__ +#if defined(__WXMAC__) + #define wxHAS_GUI_PROCESS_CALLBACKS #define wxHAS_GUI_SOCKET_MANAGER #endif @@ -50,9 +50,6 @@ 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 @@ -62,27 +59,33 @@ 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; -#if defined(__WXGTK__) && wxUSE_INTL - virtual void SetLocale(); -#endif // __WXGTK__ - #ifdef __WXGTK20__ virtual wxString GetDesktopEnvironment() const; virtual wxString GetStandardCmdLineOptions(wxArrayString& names, wxArrayString& desc) const; #endif // __WXGTK20____ -#if defined(__WXDEBUG__) && defined(__WXGTK20__) +#if defined(__WXGTK20__) virtual bool ShowAssertDialog(const wxString& msg); #endif -#if wxUSE_SOCKETS && defined(wxHAS_GUI_SOCKET_MANAGER) - 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