use native lines/columns per action for mouse wheel event

[wxWidgets.git] / src / os2 / menuitem.cpp

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 6a17b43d41fbdf0796d9d3ecc2db1f8a0aafd88e..d94f1ffaad35609135ba6742a4ab2566e4a0e6ca 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -4,7 +4,6 @@
 // Author:      David Webster
 // Modified by:
 // Created:     10/10/98
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -58,8 +57,6 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-
 // ----------------------------------------------------------------------------
 // wxMenuItem
 // ----------------------------------------------------------------------------
@@ -491,10 +488,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 +694,7 @@ bool wxMenuItem::OnDrawItem( wxDC& rDC,
     // Draw the bitmap
     // ---------------
     //
-    if (IsCheckable() && !m_bmpChecked.Ok())
+    if (IsCheckable() && !m_bmpChecked.IsOk())
     {
         if (eStatus & wxODChecked)
         {
@@ -726,7 +723,7 @@ bool wxMenuItem::OnDrawItem( wxDC& rDC,
         //
         wxBitmap vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE));
 
-        if (vBmp.Ok())
+        if (vBmp.IsOk())
         {
 
             wxMemoryDC              vDCMem(&rDC);