Add missing WXK constants for the control keys

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

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 6a17b43d41fbdf0796d9d3ecc2db1f8a0aafd88e..59d72dacedbc54d68ac40e0a8cf4de05cdb42e5f 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -58,8 +58,6 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-

 // ----------------------------------------------------------------------------
 // wxMenuItem
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // 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.
     //
     // 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);
         //
         size_t                      nAdjustedHeight = m_bmpChecked.GetHeight() +
                                                       wxSystemSettings::GetMetric(wxSYS_EDGE_Y);


@@ -697,7 +695,7 @@ bool wxMenuItem::OnDrawItem( wxDC& rDC,
     // Draw the bitmap
     // ---------------
     //
     // Draw the bitmap
     // ---------------
     //

-    if (IsCheckable() && !m_bmpChecked.Ok())
+    if (IsCheckable() && !m_bmpChecked.IsOk())

     {
         if (eStatus & wxODChecked)
         {
     {
         if (eStatus & wxODChecked)
         {


@@ -726,7 +724,7 @@ bool wxMenuItem::OnDrawItem( wxDC& rDC,
         //
         wxBitmap vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE));
 
         //
         wxBitmap vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE));
 

-        if (vBmp.Ok())
+        if (vBmp.IsOk())

         {
 
             wxMemoryDC              vDCMem(&rDC);
         {
 
             wxMemoryDC              vDCMem(&rDC);