X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f90913e2ac7938728beed9065f34b7d4c7593513..eafdb19c44154550b3c6155a62642e7ab5c6e64d:/include/wx/os2/apptrait.h diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h index 34b5e30233..2cdb32a4a8 100644 --- a/include/wx/os2/apptrait.h +++ b/include/wx/os2/apptrait.h @@ -19,9 +19,11 @@ class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase { public: +#if wxUSE_CONSOLE_EVENTLOOP virtual wxEventLoopBase *CreateEventLoop(); +#endif // wxUSE_CONSOLE_EVENTLOOP #if wxUSE_TIMER - virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) { return NULL; }; + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); #endif }; @@ -34,7 +36,7 @@ public: #if wxUSE_TIMER virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); #endif - virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const; + virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const; // wxThread helpers // ---------------- @@ -48,10 +50,20 @@ public: virtual wxString GetDesktopEnvironment() const; #endif #if wxUSE_SOCKETS - virtual GSocketManager *GetSocketManager(); + virtual wxFDIOManager *GetFDIOManager(); #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_