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:
@@ -1182,7 +1182,7 @@ void wxDC::DrawLabel(const wxString& text,
|
||||
GetMultiLineTextExtent(text, &widthText, &heightText, &heightLine);
|
||||
|
||||
wxCoord width, height;
|
||||
if ( bitmap.Ok() )
|
||||
if ( bitmap.IsOk() )
|
||||
{
|
||||
width = widthText + bitmap.GetWidth();
|
||||
height = bitmap.GetHeight();
|
||||
@@ -1224,7 +1224,7 @@ void wxDC::DrawLabel(const wxString& text,
|
||||
wxCoord x0 = x,
|
||||
y0 = y,
|
||||
width0 = width;
|
||||
if ( bitmap.Ok() )
|
||||
if ( bitmap.IsOk() )
|
||||
{
|
||||
DrawBitmap(bitmap, x, y, true /* use mask */);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user