X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98fbab9e7bf70ee8af44a78ea2a1d2cbb406880a..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/os2/menuitem.cpp?ds=sidebyside diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index 6a17b43d41..59d72daced 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -58,8 +58,6 @@ // dynamic classes implementation // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) - // ---------------------------------------------------------------------------- // wxMenuItem // ---------------------------------------------------------------------------- @@ -491,10 +489,10 @@ bool wxMenuItem::OnMeasureItem( size_t* pWidth, size_t* pHeight ) // resize the space so the BMP will fit. Without this, BMPs // must be no larger or smaller than 16x16. // - if (m_bmpChecked.Ok()) + if (m_bmpChecked.IsOk()) { // - // Is BMP height larger then text height? + // Is BMP height larger than text height? // size_t nAdjustedHeight = m_bmpChecked.GetHeight() + wxSystemSettings::GetMetric(wxSYS_EDGE_Y); @@ -697,7 +695,7 @@ bool wxMenuItem::OnDrawItem( wxDC& rDC, // Draw the bitmap // --------------- // - if (IsCheckable() && !m_bmpChecked.Ok()) + if (IsCheckable() && !m_bmpChecked.IsOk()) { if (eStatus & wxODChecked) { @@ -726,7 +724,7 @@ bool wxMenuItem::OnDrawItem( wxDC& rDC, // wxBitmap vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE)); - if (vBmp.Ok()) + if (vBmp.IsOk()) { wxMemoryDC vDCMem(&rDC);