X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b8a696220b7a9aae68c484025e90587de203fc3..27f35b6674b796e61986681261ec7a96bef93502:/src/mac/menu.cpp

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 213c14cd48..caadf18ce3 100644
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -70,7 +70,6 @@ void wxMenu::Init()
 	Str255 	label;
 	wxMenuItem::MacBuildMenuString( label, NULL , NULL , m_title , false );
 	m_macMenuId = s_macNextMenuId++; 
-    wxCHECK_RET( s_macNextMenuId < 236 , "menu ids > 235 cannot be used for submenus on mac" );
 	m_hMenu = ::NewMenu(m_macMenuId, label);
 
     if ( !m_hMenu )
@@ -210,10 +209,34 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 			if ( pos == (size_t)-1 )
 			{
 				UMAAppendMenuItem(MAC_WXHMENU(m_hMenu), label,key,modifiers);
+				if ( pItem->GetBitmap().Ok() )
+				{
+					ControlButtonContentInfo info ;
+					wxMacCreateBitmapButton( &info , pItem->GetBitmap() , true ) ;
+					if ( info.contentType != kControlNoContent )
+					{
+						if ( info.contentType == kControlContentCIconHandle )
+							SetMenuItemIconHandle( MAC_WXHMENU(m_hMenu) , CountMenuItems(MAC_WXHMENU(m_hMenu) ) ,
+								kMenuColorIconType , (Handle) info.u.cIconHandle ) ;
+				    }
+						
+				}
 			}
 			else
 			{
 				UMAInsertMenuItem(MAC_WXHMENU(m_hMenu), label , pos,key,modifiers);
+				if ( pItem->GetBitmap().Ok() )
+				{
+					ControlButtonContentInfo info ;
+					wxMacCreateBitmapButton( &info , pItem->GetBitmap() , true ) ;
+					if ( info.contentType != kControlNoContent )
+					{
+						if ( info.contentType == kControlContentCIconHandle )
+							SetMenuItemIconHandle( MAC_WXHMENU(m_hMenu) , pos ,
+								kMenuColorIconType , (Handle) info.u.cIconHandle ) ;
+				    }
+						
+				}
 			}
   			if ( pItem->GetId() == idMenuTitle ) 
   			{
@@ -577,7 +600,7 @@ wxMenuBar::~wxMenuBar()
 
 }
 
-void wxMenuBar::Refresh()
+void wxMenuBar::Refresh(bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect))
 {
     wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );