resource loader structure added for loading menu bar, apple menu will not get multipl...

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

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index e53992df980314615f8eeb073cd38801daf40392..1159391d370a49db7487481e0d4fee8cc0805f56 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -613,13 +613,16 @@ void wxMenuBar::RebuildAccelTable()
 }
 
 #endif // wxUSE_ACCEL
 }
 
 #endif // wxUSE_ACCEL

-
-
+#ifdef WXMAKINGDLL
+extern short gCurrentResource ;
+#endif

 void wxMenuBar::MacInstallMenuBar() 
 {
        if ( s_macInstalledMenuBar == this )
                return ;
                
 void wxMenuBar::MacInstallMenuBar() 
 {
        if ( s_macInstalledMenuBar == this )
                return ;
                

+    wxStAppResource resload ;
+               

        Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ;
        wxString message ;
        wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );
        Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ;
        wxString message ;
        wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );


@@ -632,7 +635,10 @@ void wxMenuBar::MacInstallMenuBar()
 
                MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;
 #if TARGET_API_MAC_OS8
 
                MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;
 #if TARGET_API_MAC_OS8

-               ::AppendResMenu(menu, 'DRVR');
+    if ( CountMenuItems( menu ) == 2 )
+    {
+                 ::AppendResMenu(menu, 'DRVR');
+               }

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


@@ -733,7 +739,6 @@ void wxMenuBar::MacInstallMenuBar()
                        }
                }
                ::DrawMenuBar() ;
                        }
                }
                ::DrawMenuBar() ;

-

        s_macInstalledMenuBar = this;
 }
 
        s_macInstalledMenuBar = this;
 }
 

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index e53992df980314615f8eeb073cd38801daf40392..1159391d370a49db7487481e0d4fee8cc0805f56 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -613,13 +613,16 @@ void wxMenuBar::RebuildAccelTable()
 }
 
 #endif // wxUSE_ACCEL
 }
 
 #endif // wxUSE_ACCEL

-
-
+#ifdef WXMAKINGDLL
+extern short gCurrentResource ;
+#endif

 void wxMenuBar::MacInstallMenuBar() 
 {
        if ( s_macInstalledMenuBar == this )
                return ;
                
 void wxMenuBar::MacInstallMenuBar() 
 {
        if ( s_macInstalledMenuBar == this )
                return ;
                

+    wxStAppResource resload ;
+               

        Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ;
        wxString message ;
        wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );
        Handle menubar = ::GetNewMBar( kwxMacMenuBarResource ) ;
        wxString message ;
        wxCHECK_RET( menubar != NULL, "can't read MBAR resource" );


@@ -632,7 +635,10 @@ void wxMenuBar::MacInstallMenuBar()
 
                MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;
 #if TARGET_API_MAC_OS8
 
                MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;
 #if TARGET_API_MAC_OS8

-               ::AppendResMenu(menu, 'DRVR');
+    if ( CountMenuItems( menu ) == 2 )
+    {
+                 ::AppendResMenu(menu, 'DRVR');
+               }

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


@@ -733,7 +739,6 @@ void wxMenuBar::MacInstallMenuBar()
                        }
                }
                ::DrawMenuBar() ;
                        }
                }
                ::DrawMenuBar() ;

-

        s_macInstalledMenuBar = this;
 }
 
        s_macInstalledMenuBar = this;
 }