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:
@@ -95,10 +95,10 @@ void wxControlRenderer::DrawButtonLabel(const wxBitmap& bitmap,
|
||||
m_dc.SetTextForeground(m_window->GetForegroundColour());
|
||||
|
||||
wxString label = m_window->GetLabel();
|
||||
if ( !label.empty() || bitmap.Ok() )
|
||||
if ( !label.empty() || bitmap.IsOk() )
|
||||
{
|
||||
wxRect rectLabel = m_rect;
|
||||
if ( bitmap.Ok() )
|
||||
if ( bitmap.IsOk() )
|
||||
{
|
||||
rectLabel.Inflate(-marginX, -marginY);
|
||||
}
|
||||
@@ -158,7 +158,7 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
|
||||
{
|
||||
// we may change the bitmap if we stretch it
|
||||
wxBitmap bmp = bitmap;
|
||||
if ( !bmp.Ok() )
|
||||
if ( !bmp.IsOk() )
|
||||
return;
|
||||
|
||||
int width = bmp.GetWidth(),
|
||||
|
||||
Reference in New Issue
Block a user