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:
@@ -1063,7 +1063,7 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc,
|
||||
- data->CheckBgMargin.cyBottomHeight
|
||||
- data->CheckMargin.cyBottomHeight);
|
||||
|
||||
if ( IsCheckable() && !m_bmpChecked.Ok() )
|
||||
if ( IsCheckable() && !m_bmpChecked.IsOk() )
|
||||
{
|
||||
if ( stat & wxODChecked )
|
||||
{
|
||||
@@ -1079,25 +1079,25 @@ bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc,
|
||||
bmp = GetDisabledBitmap();
|
||||
}
|
||||
|
||||
if ( !bmp.Ok() )
|
||||
if ( !bmp.IsOk() )
|
||||
{
|
||||
// for not checkable bitmaps we should always use unchecked one
|
||||
// because their checked bitmap is not set
|
||||
bmp = GetBitmap(!IsCheckable() || (stat & wxODChecked));
|
||||
|
||||
#if wxUSE_IMAGE
|
||||
if ( bmp.Ok() && stat & wxODDisabled )
|
||||
if ( bmp.IsOk() && stat & wxODDisabled )
|
||||
{
|
||||
// we need to grey out the bitmap as we don't have any specific
|
||||
// disabled bitmap
|
||||
wxImage imgGrey = bmp.ConvertToImage().ConvertToGreyscale();
|
||||
if ( imgGrey.Ok() )
|
||||
if ( imgGrey.IsOk() )
|
||||
bmp = wxBitmap(imgGrey);
|
||||
}
|
||||
#endif // wxUSE_IMAGE
|
||||
}
|
||||
|
||||
if ( bmp.Ok() )
|
||||
if ( bmp.IsOk() )
|
||||
{
|
||||
wxMemoryDC dcMem(&dc);
|
||||
dcMem.SelectObjectAsSource(bmp);
|
||||
|
||||
Reference in New Issue
Block a user