X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/msw/apptrait.h diff --git a/include/wx/msw/apptrait.h b/include/wx/msw/apptrait.h index 86e7a1014f..40cf996c8d 100644 --- a/include/wx/msw/apptrait.h +++ b/include/wx/msw/apptrait.h @@ -5,7 +5,7 @@ // Modified by: // Created: 21.06.2003 // RCS-ID: $Id$ -// Copyright: (c) 2003 Vadim Zeitlin +// Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -16,26 +16,35 @@ // wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase +class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase { public: + virtual wxEventLoopBase *CreateEventLoop(); virtual void *BeforeChildWaitLoop(); virtual void AlwaysYield(); virtual void AfterChildWaitLoop(void *data); - +#if wxUSE_TIMER + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); +#endif virtual bool DoMessageFromThreadWait(); + virtual WXDWORD WaitForThread(WXHANDLE hThread); }; #if wxUSE_GUI -class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase +class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase { public: + virtual wxEventLoopBase *CreateEventLoop(); virtual void *BeforeChildWaitLoop(); virtual void AlwaysYield(); virtual void AfterChildWaitLoop(void *data); - +#if wxUSE_TIMER + virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); +#endif virtual bool DoMessageFromThreadWait(); + virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const; + virtual WXDWORD WaitForThread(WXHANDLE hThread); }; #endif // wxUSE_GUI