X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..8fc574b40c0c7dfbe4b19263d1ef178b51a45488:/include/wx/unix/apptrait.h?ds=inline diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index 30b96497c1..d84e63e67c 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -5,7 +5,7 @@ // Modified by: // Created: 23.06.2003 // RCS-ID: $Id$ -// Copyright: (c) 2003 Vadim Zeitlin +// Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -19,12 +19,10 @@ class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase { public: - virtual bool CreateEndProcessPipe(); + virtual bool CreateEndProcessPipe(wxExecuteData& execData); virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd); virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData); virtual int WaitForChild(wxExecuteData& execData); - - virtual int GetOSVersion(int *verMaj, int *verMin); }; #if wxUSE_GUI @@ -37,7 +35,14 @@ public: virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData); virtual int WaitForChild(wxExecuteData& execData); - virtual int GetOSVersion(int *verMaj, int *verMin); +#if defined(__WXMAC__) || defined(__WXCOCOA__) + virtual wxStandardPathsBase& GetStandardPaths(); +#endif + virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const; + +#ifdef __WXGTK__ + virtual wxString GetDesktopEnvironment() const; +#endif }; #endif // wxUSE_GUI