X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ef723747cc680b3c237053bf0e3a78f0f179694..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/univ/stdrend.cpp?ds=sidebyside diff --git a/src/univ/stdrend.cpp b/src/univ/stdrend.cpp index 0159f76d77..64e7903504 100644 --- a/src/univ/stdrend.cpp +++ b/src/univ/stdrend.cpp @@ -151,7 +151,7 @@ wxStdRenderer::ArrowDirection wxStdRenderer::GetArrowDirection(wxDirection dir) return Arrow_Down; default: - wxFAIL_MSG(_T("unknown arrow direction")); + wxFAIL_MSG(wxT("unknown arrow direction")); } return Arrow_Max; @@ -169,7 +169,7 @@ void wxStdRenderer::DrawBackground(wxDC& dc, { wxColour colBg; - if (col.Ok()) + if (col.IsOk()) { colBg = col; } @@ -438,7 +438,7 @@ void wxStdRenderer::DrawBorder(wxDC& dc, break; default: - wxFAIL_MSG(_T("unknown border type")); + wxFAIL_MSG(wxT("unknown border type")); // fall through case wxBORDER_DEFAULT: @@ -471,7 +471,7 @@ wxRect wxStdRenderer::GetBorderDimensions(wxBorder border) const break; #endif default: - wxFAIL_MSG(_T("unknown border type")); + wxFAIL_MSG(wxT("unknown border type")); // fall through case wxBORDER_DEFAULT: @@ -678,7 +678,7 @@ void wxStdRenderer::DrawCheckButton(wxDC& dc, wxAlignment align, int indexAccel) { - if (bitmap.Ok()) + if (bitmap.IsOk()) DrawCheckOrRadioButton(dc, label, bitmap, rect, flags, align, indexAccel); else DrawCheckOrRadioButton(dc, label, GetCheckBitmap(flags), rect, flags, align, indexAccel); @@ -692,7 +692,7 @@ void wxStdRenderer::DrawRadioButton(wxDC& dc, wxAlignment align, int indexAccel) { - if (bitmap.Ok()) + if (bitmap.IsOk()) DrawCheckOrRadioButton(dc, label, bitmap, rect, flags, align, indexAccel); else DrawCheckOrRadioButton(dc, label, GetRadioBitmap(flags), rect, flags, align, indexAccel); @@ -862,7 +862,7 @@ wxSize wxStdRenderer::GetStatusBarBorders() const wxRect flat = GetBorderDimensions(wxBORDER_STATIC); wxASSERT_MSG( raised.x == raised.width && raised.y == raised.height && flat.x == flat.width && flat.y == flat.height, - _T("this code expects uniform borders, you must override GetStatusBarBorders") ); + wxT("this code expects uniform borders, you must override GetStatusBarBorders") ); // take the larger of flat/raised values: wxSize border(wxMax(raised.x, flat.x), wxMax(raised.y, flat.y)); @@ -892,6 +892,8 @@ void wxStdRenderer::DrawStatusField(wxDC& dc, DrawBorder(dc, wxBORDER_RAISED, rect, flags, &rectIn); else if ( style != wxSB_FLAT ) DrawBorder(dc, wxBORDER_STATIC, rect, flags, &rectIn); + else + rectIn = rect; rectIn.Deflate(GetStatusBarFieldMargins()); @@ -1146,7 +1148,7 @@ void wxStdRenderer::DrawFrameIcon(wxDC& dc, const wxIcon& icon, int flags) { - if ( icon.Ok() ) + if ( icon.IsOk() ) { wxRect r = GetFrameClientArea(rect, flags & ~wxTOPLEVEL_TITLEBAR); dc.DrawIcon(icon, r.x, r.y); @@ -1172,7 +1174,7 @@ void wxStdRenderer::DrawFrameButton(wxDC& dc, } wxBitmap bmp = GetFrameButtonBitmap(idx); - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) return; wxRect rectBtn(x, y, FRAME_BUTTON_WIDTH, FRAME_BUTTON_HEIGHT);