X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edc513440242bb3f1dc8fe215b129a2ac4b7c692..b5aaf62e977b828214d65c3712478410fb2c8a05:/src/msw/dcclient.cpp diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp index 1e667aa704..b64aee8c82 100644 --- a/src/msw/dcclient.cpp +++ b/src/msw/dcclient.cpp @@ -67,13 +67,13 @@ WX_DEFINE_OBJARRAY(wxArrayDCInfo) static PAINTSTRUCT g_paintStruct; -#ifdef __WXDEBUG__ +#ifdef wxHAS_PAINT_DEBUG // a global variable which we check to verify that wxPaintDC are only // created in response to WM_PAINT message - doing this from elsewhere is a // common programming error among wxWidgets programmers and might lead to // very subtle and difficult to debug refresh/repaint bugs. int g_isPainting = 0; -#endif // __WXDEBUG__ +#endif // wxHAS_PAINT_DEBUG // =========================================================================== // implementation @@ -93,7 +93,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner ) : wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) : wxMSWDCImpl( owner ) { - wxCHECK_RET( window, _T("invalid window in wxWindowDCImpl") ); + wxCHECK_RET( window, wxT("invalid window in wxWindowDCImpl") ); m_window = window; m_hDC = (WXHDC) ::GetWindowDC(GetHwndOf(m_window)); @@ -117,7 +117,7 @@ void wxWindowDCImpl::InitDC() void wxWindowDCImpl::DoGetSize(int *width, int *height) const { - wxCHECK_RET( m_window, _T("wxWindowDCImpl without a window?") ); + wxCHECK_RET( m_window, wxT("wxWindowDCImpl without a window?") ); m_window->GetSize(width, height); } @@ -136,7 +136,7 @@ wxClientDCImpl::wxClientDCImpl( wxDC *owner ) : wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *window ) : wxWindowDCImpl( owner ) { - wxCHECK_RET( window, _T("invalid window in wxClientDCImpl") ); + wxCHECK_RET( window, wxT("invalid window in wxClientDCImpl") ); m_window = window; m_hDC = (WXHDC)::GetDC(GetHwndOf(window)); @@ -177,7 +177,7 @@ wxClientDCImpl::~wxClientDCImpl() void wxClientDCImpl::DoGetSize(int *width, int *height) const { - wxCHECK_RET( m_window, _T("wxClientDCImpl without a window?") ); + wxCHECK_RET( m_window, wxT("wxClientDCImpl without a window?") ); m_window->GetClientSize(width, height); } @@ -216,14 +216,14 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *window ) : { wxCHECK_RET( window, wxT("NULL canvas in wxPaintDCImpl ctor") ); -#ifdef __WXDEBUG__ +#ifdef wxHAS_PAINT_DEBUG if ( g_isPainting <= 0 ) { wxFAIL_MSG( wxT("wxPaintDCImpl may be created only in EVT_PAINT handler!") ); return; } -#endif // __WXDEBUG__ +#endif // wxHAS_PAINT_DEBUG m_window = window;