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:
@@ -125,7 +125,7 @@ bool wxButton::Create(wxWindow *parent,
|
||||
|
||||
SetLabel(label);
|
||||
|
||||
if (bitmap.Ok())
|
||||
if (bitmap.IsOk())
|
||||
SetBitmap(bitmap); // SetInitialSize called by SetBitmap()
|
||||
else
|
||||
SetInitialSize(size);
|
||||
@@ -170,7 +170,7 @@ wxSize wxButton::DoGetBestClientSize() const
|
||||
wxCoord width, height;
|
||||
dc.GetMultiLineTextExtent(GetLabel(), &width, &height);
|
||||
|
||||
if ( m_bitmap.Ok() )
|
||||
if ( m_bitmap.IsOk() )
|
||||
{
|
||||
// allocate extra space for the bitmap
|
||||
wxCoord heightBmp = m_bitmap.GetHeight() + 2*m_marginBmpY;
|
||||
@@ -221,7 +221,7 @@ bool wxButton::DoDrawBackground(wxDC& dc)
|
||||
rect.width = size.x;
|
||||
rect.height = size.y;
|
||||
|
||||
if ( GetBackgroundBitmap().Ok() )
|
||||
if ( GetBackgroundBitmap().IsOk() )
|
||||
{
|
||||
// get the bitmap and the flags
|
||||
int alignment;
|
||||
|
Reference in New Issue
Block a user