X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11fed901d1744019e2a4279714d172829a3c0699..7889a3a9fc2fcf922e07dfe500fafac7cbaf0afd:/src/osx/menuitem_osx.cpp

diff --git a/src/osx/menuitem_osx.cpp b/src/osx/menuitem_osx.cpp
index 51fc4e457b..3d83c08356 100644
--- a/src/osx/menuitem_osx.cpp
+++ b/src/osx/menuitem_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: menuitem.cpp 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -29,8 +29,6 @@ wxMenuItemImpl::~wxMenuItemImpl()
 {
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-
 wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        int id,
                        const wxString& t,
@@ -48,14 +46,14 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
 
     m_radioGroup.start = -1;
     m_isRadioGroupStart = false;
-    
+
     wxString text = wxStripMenuCodes(m_text);
     if (text.IsEmpty() && !IsSeparator())
     {
         wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
         text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
     }
-    
+
     wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( m_text ) ;
     // use accessors for ID and Kind because they might have been changed in the base constructor
     m_peer = wxMenuItemImpl::Create( this, pParentMenu, GetId(), text, entry, strHelp, GetKind(), pSubMenu );
@@ -83,7 +81,7 @@ void wxMenuItem::Enable(bool bDoEnable)
       // eg. BeginAppModalStateForWindow() will disable menus and ignore this change
       // which in turn causes m_isEnabled to become out of sync with real menuitem state
 #if wxOSX_USE_CARBON
-         && !(m_parentMenu && !IsMenuItemEnabled(MAC_WXHMENU(m_parentMenu->GetHMenu()), 0)) 
+         && !(m_parentMenu && !IsMenuItemEnabled(MAC_WXHMENU(m_parentMenu->GetHMenu()), 0))
 #endif
          )
       // always update builtin menuitems
@@ -123,7 +121,7 @@ void wxMenuItem::Check(bool bDoCheck)
                 const wxMenuItemList& items = m_parentMenu->GetMenuItems();
                 int pos = items.IndexOf(this);
                 wxCHECK_RET( pos != wxNOT_FOUND,
-                             _T("menuitem not found in the menu items list?") );
+                             wxT("menuitem not found in the menu items list?") );
 
                 // get the radio group range
                 int start, end;
@@ -176,7 +174,7 @@ void wxMenuItem::UpdateItemBitmap()
 {
     if ( !m_parentMenu )
         return;
-    
+
     if ( m_bitmap.Ok() )
     {
         m_peer->SetBitmap( m_bitmap );
@@ -190,12 +188,12 @@ void wxMenuItem::UpdateItemStatus()
 
     if ( IsSeparator() )
         return ;
-        
+
     if ( IsCheckable() && IsChecked() )
         m_peer->Check( true );
     else
         m_peer->Check( false );
-        
+
     m_peer->Enable( IsEnabled() );
 }
 
@@ -210,7 +208,7 @@ void wxMenuItem::UpdateItemText()
         wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
         text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
     }
-    
+
     wxAcceleratorEntry *entry = wxAcceleratorEntry::Create( m_text ) ;
     m_peer->SetLabel( text, entry );
     delete entry ;