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:
@@ -618,7 +618,7 @@ void wxToolBar::CreateDisabledImageList()
|
||||
{
|
||||
wxToolBarToolBase *tool = node->GetData();
|
||||
wxBitmap bmpDisabled = tool->GetDisabledBitmap();
|
||||
if ( bmpDisabled.Ok() )
|
||||
if ( bmpDisabled.IsOk() )
|
||||
{
|
||||
const wxSize sizeBitmap = bmpDisabled.GetSize();
|
||||
m_disabledImgList = new wxImageList
|
||||
@@ -744,7 +744,7 @@ bool wxToolBar::Realize()
|
||||
const int w = bmp.GetWidth();
|
||||
const int h = bmp.GetHeight();
|
||||
|
||||
if ( bmp.Ok() )
|
||||
if ( bmp.IsOk() )
|
||||
{
|
||||
int xOffset = wxMax(0, (m_defaultWidth - w)/2);
|
||||
int yOffset = wxMax(0, (m_defaultHeight - h)/2);
|
||||
@@ -762,7 +762,7 @@ bool wxToolBar::Realize()
|
||||
{
|
||||
wxBitmap bmpDisabled = tool->GetDisabledBitmap();
|
||||
#if wxUSE_IMAGE && wxUSE_WXDIB
|
||||
if ( !bmpDisabled.Ok() )
|
||||
if ( !bmpDisabled.IsOk() )
|
||||
{
|
||||
// no disabled bitmap specified but we still need to
|
||||
// fill the space in the image list with something, so
|
||||
|
Reference in New Issue
Block a user