X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf63f3d3ae66075641094ab03328403c7d6e74df..2e14066008229145e2da7b9f05a478ce38631f83:/src/os2/utilsgui.cpp diff --git a/src/os2/utilsgui.cpp b/src/os2/utilsgui.cpp index 03436d722b..eca34900b8 100644 --- a/src/os2/utilsgui.cpp +++ b/src/os2/utilsgui.cpp @@ -6,7 +6,7 @@ // Created: 20.08.2003 (extracted from os2/utils.cpp) // RCS-ID: $Id$ // Copyright: (c) David Webster -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -33,6 +33,8 @@ #endif //WX_PRECOMP #include "wx/apptrait.h" +#include "wx/os2/private/timer.h" +#include "wx/evtloop.h" #include "wx/os2/private.h" // includes @@ -80,7 +82,7 @@ void wxBeginBusyCursor(const wxCursor* pCursor) void wxEndBusyCursor() { wxCHECK_RET( gs_wxBusyCursorCount > 0 - ,_T("no matching wxBeginBusyCursor() for wxEndBusyCursor()") + ,wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") ); if (--gs_wxBusyCursorCount == 0) @@ -114,7 +116,7 @@ bool wxCheckForInterrupt( wxWindow* pWnd ) } else { - wxFAIL_MSG(_T("pWnd==NULL !!!")); + wxFAIL_MSG(wxT("pWnd==NULL !!!")); return false;//*** temporary? } } @@ -261,6 +263,15 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const return wxPORT_OS2; } +wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) +{ + return new wxOS2TimerImpl(timer); +} + +wxEventLoopBase* wxGUIAppTraits::CreateEventLoop() +{ + return new wxEventLoop; +} // --------------------------------------------------------------------------- // window information functions @@ -848,7 +859,7 @@ wxBitmap wxDisableBitmap( ::GpiSetBitmap(hPS, NULLHANDLE); ::GpiDestroyPS(hPS); ::DevCloseDC(hDC); - if (vNewBmp.Ok()) + if (vNewBmp.IsOk()) return(vNewBmp); return(wxNullBitmap); } // end of wxDisableBitmap