X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..80255b7eaf9427daf6fa21a3f27e4475dcc54cf8:/include/wx/os2/apptrait.h diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h index 2ac1f4a891..4038e88094 100644 --- a/include/wx/os2/apptrait.h +++ b/include/wx/os2/apptrait.h @@ -19,7 +19,12 @@ class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase { public: - virtual wxToolkitInfo& GetToolkitInfo(); +#if wxUSE_CONSOLE_EVENTLOOP + virtual wxEventLoopBase *CreateEventLoop(); +#endif // wxUSE_CONSOLE_EVENTLOOP +#if wxUSE_TIMER + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); +#endif }; #if wxUSE_GUI @@ -27,7 +32,11 @@ public: class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase { public: - virtual wxToolkitInfo& GetToolkitInfo(); + virtual wxEventLoopBase *CreateEventLoop(); +#if wxUSE_TIMER + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); +#endif + virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const; // wxThread helpers // ---------------- @@ -37,8 +46,24 @@ public: // Clean up message queue. virtual void TerminateGui(unsigned long ulHab); +#ifdef __WXGTK__ + virtual wxString GetDesktopEnvironment() const; +#endif +#if wxUSE_SOCKETS + virtual wxSocketManager *GetSocketManager(); +#endif }; +#ifndef __WXPM__ +inline void wxGUIAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab)) +{ +} + +inline void wxGUIAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab)) +{ +} +#endif + #endif // wxUSE_GUI #endif // _WX_OS2_APPTRAIT_H_