corrected apple menu and help menu anomalies under carbon

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 548f803aab13b2efc73c0d141d528943c1a27a67..d00177fe92eb6caf1756f79d1110bc9f6e738a17 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -626,10 +626,16 @@ void wxMenuBar::MacInstallMenuBar()
        wxString message ;
        wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );
        ::SetMenuBar( menubar ) ;
        wxString message ;
        wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );
        ::SetMenuBar( menubar ) ;

+#if TARGET_API_MAC_CARBON
+    ::DisposeMenuBar( menubar ) ;
+#else

        ::DisposeHandle( menubar ) ;
        ::DisposeHandle( menubar ) ;

+#endif

 
                MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;
 
                MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;

+#if TARGET_API_MAC_OS8

                ::AppendResMenu(menu, 'DRVR');
                ::AppendResMenu(menu, 'DRVR');

+#endif

  
        for (int i = 0; i < m_menus.GetCount(); i++)
        {
  
        for (int i = 0; i < m_menus.GetCount(); i++)
        {


@@ -646,6 +652,11 @@ void wxMenuBar::MacInstallMenuBar()
                          {
                            continue ;
                          }
                          {
                            continue ;
                          }

+
+                   for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i )
+                   {
+                     DeleteMenuItem( mh , i ) ;
+                   }

                                        
                                for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) 
                                {
                                        
                                for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) 
                                {

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 548f803aab13b2efc73c0d141d528943c1a27a67..d00177fe92eb6caf1756f79d1110bc9f6e738a17 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -626,10 +626,16 @@ void wxMenuBar::MacInstallMenuBar()
        wxString message ;
        wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );
        ::SetMenuBar( menubar ) ;
        wxString message ;
        wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );
        ::SetMenuBar( menubar ) ;

+#if TARGET_API_MAC_CARBON
+    ::DisposeMenuBar( menubar ) ;
+#else

        ::DisposeHandle( menubar ) ;
        ::DisposeHandle( menubar ) ;

+#endif

 
                MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;
 
                MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;

+#if TARGET_API_MAC_OS8

                ::AppendResMenu(menu, 'DRVR');
                ::AppendResMenu(menu, 'DRVR');

+#endif

  
        for (int i = 0; i < m_menus.GetCount(); i++)
        {
  
        for (int i = 0; i < m_menus.GetCount(); i++)
        {


@@ -646,6 +652,11 @@ void wxMenuBar::MacInstallMenuBar()
                          {
                            continue ;
                          }
                          {
                            continue ;
                          }

+
+                   for ( int i = CountMenuItems( mh ) ; i >= firstUserHelpMenuItem ; --i )
+                   {
+                     DeleteMenuItem( mh , i ) ;
+                   }

                                        
                                for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) 
                                {
                                        
                                for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) 
                                {