Changed wxStat, wxAccess and wxOpen to no longer

[wxWidgets.git] / src / mac / menu.cpp

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index e53992df980314615f8eeb073cd38801daf40392..e31651102caa61ddb110b34760d1cd802045718a 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -577,7 +577,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") );
 
 {
     wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );
 


@@ -614,33 +614,37 @@ void wxMenuBar::RebuildAccelTable()
 
 #endif // wxUSE_ACCEL
 
 
 #endif // wxUSE_ACCEL
 

-

 void wxMenuBar::MacInstallMenuBar() 
 {
 void wxMenuBar::MacInstallMenuBar() 
 {

-       if ( s_macInstalledMenuBar == this )
-               return ;
+    if ( s_macInstalledMenuBar == this )
+        return ;
+               
+    wxStAppResource resload ;

                
                

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

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

-       ::DisposeHandle( menubar ) ;
+    ::DisposeHandle( menubar ) ;

 #endif
 
 #endif
 

-               MenuHandle menu = ::GetMenuHandle( kwxMacAppleMenuId ) ;

 #if TARGET_API_MAC_OS8
 #if TARGET_API_MAC_OS8

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

 #endif
  
 #endif
  

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

        {
        {

-                       Str255  label;
-       wxNode *node;
-       wxMenuItem *item;
-       int pos ;
+            Str255     label;
+            wxNode *node;
+            wxMenuItem *item;
+            int pos ;

                        wxMenu* menu = m_menus[i] , *subMenu = NULL ;
                
                        if( m_titles[i] == "?" || m_titles[i] == "&?"  || m_titles[i] == wxApp::s_macHelpMenuTitleName )
                        wxMenu* menu = m_menus[i] , *subMenu = NULL ;
                
                        if( m_titles[i] == "?" || m_titles[i] == "&?"  || m_titles[i] == wxApp::s_macHelpMenuTitleName )


@@ -713,7 +717,7 @@ void wxMenuBar::MacInstallMenuBar()
                                        }
                                }
                                ::InsertMenu(MAC_WXHMENU(m_menus[i]->GetHMenu()), 0);
                                        }
                                }
                                ::InsertMenu(MAC_WXHMENU(m_menus[i]->GetHMenu()), 0);

-                               for ( int i = 0 ; i < submenus.GetCount() ; ++i )
+                               for ( size_t i = 0 ; i < submenus.GetCount() ; ++i )

                                {
                                  wxMenu* submenu = (wxMenu*) submenus[i] ;
                wxNode *subnode;
                                {
                                  wxMenu* submenu = (wxMenu*) submenus[i] ;
                wxNode *subnode;


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

-

        s_macInstalledMenuBar = this;
 }
 
        s_macInstalledMenuBar = this;
 }
 


@@ -888,7 +891,7 @@ void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId,
     }
     else
     {          
     }
     else
     {          

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

         {
             if ( m_menus[i]->MacGetMenuId() == macMenuId || ( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?"  || m_titles[i] == wxApp::s_macHelpMenuTitleName ) ) )
             {
         {
             if ( m_menus[i]->MacGetMenuId() == macMenuId || ( macMenuId == kHMHelpMenuID && ( m_titles[i] == "?" || m_titles[i] == "&?"  || m_titles[i] == wxApp::s_macHelpMenuTitleName ) ) )
             {


@@ -902,7 +905,7 @@ void wxMenuBar::MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId,
             }
         }
        
             }
         }
        

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

          {
                if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
                {
          {
                if ( m_menus[i]->MacMenuSelect( handler , when , macMenuId , macMenuItemNum ) )
                {