Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk(). Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -169,7 +169,7 @@ void wxStdRenderer::DrawBackground(wxDC& dc,
|
||||
{
|
||||
wxColour colBg;
|
||||
|
||||
if (col.Ok())
|
||||
if (col.IsOk())
|
||||
{
|
||||
colBg = col;
|
||||
}
|
||||
@@ -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);
|
||||
@@ -1148,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);
|
||||
@@ -1174,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);
|
||||
|
Reference in New Issue
Block a user