new file added

[wxWidgets.git] / src / cocoa / menuitem.mm

diff --git a/src/cocoa/menuitem.mm b/src/cocoa/menuitem.mm
index 1ddcbb4b614636dc771243d5e0291ee761b629a8..b5d1daa2202097a9c8a681afd284fa60496ca04b 100644 (file)
--- a/src/cocoa/menuitem.mm
+++ b/src/cocoa/menuitem.mm
@@ -82,7 +82,6 @@ WX_IMPLEMENT_GET_OBJC_CLASS(wxNSMenuItemTarget,NSObject)
 // ============================================================================
 // wxMenuItemCocoa implementation
 // ============================================================================
 // ============================================================================
 // wxMenuItemCocoa implementation
 // ============================================================================

-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)

 wxMenuItemCocoaHash wxMenuItemCocoa::sm_cocoaHash;
 
 wxObjcAutoRefFromAlloc<struct objc_object *> wxMenuItemCocoa::sm_cocoaTarget = [[WX_GET_OBJC_CLASS(wxNSMenuItemTarget) alloc] init];
 wxMenuItemCocoaHash wxMenuItemCocoa::sm_cocoaHash;
 
 wxObjcAutoRefFromAlloc<struct objc_object *> wxMenuItemCocoa::sm_cocoaTarget = [[WX_GET_OBJC_CLASS(wxNSMenuItemTarget) alloc] init];


@@ -226,7 +225,7 @@ void wxMenuItem::SetBitmaps(const wxBitmap& bmpChecked,
     }
     else
     {
     }
     else
     {

-        wxASSERT_MSG(!bmpUnchecked.Ok(),wxT("Normal menu items should only have one bitmap"));
+        wxASSERT_MSG(!bmpUnchecked.IsOk(),wxT("Normal menu items should only have one bitmap"));

         [m_cocoaNSMenuItem setImage: bmpChecked.GetNSImage(true)];
     }
 }
         [m_cocoaNSMenuItem setImage: bmpChecked.GetNSImage(true)];
     }
 }