Include module.h

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

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 417240fc0968f99b553ad42ba4cf74bf971006a8..f577bbc8a1964debf054b21458a92fd76333bdfa 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -363,7 +363,7 @@ void wxMenu::MacEnableMenu( bool bDoEnable )
 void wxMenu::MacBeforeDisplay( bool isSubMenu ) 
 {
     wxMenuItem* previousItem = NULL ;
-    int pos ;
+    size_t pos ;
     wxMenuItemList::Node *node;
     wxMenuItem *item;
     for (pos = 0, node = GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) 
@@ -382,7 +382,9 @@ void wxMenu::MacBeforeDisplay( bool isSubMenu )
                 if ( item->GetId() == wxApp::s_macPreferencesMenuItemId || item->GetId() == wxApp::s_macExitMenuItemId)
                 {
                     ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ) , pos + 1, kMenuItemAttrHidden, 0 );
-                    if ( GetMenuItems().GetCount() == pos + 1 && previousItem != NULL && previousItem->IsSeparator() )
+                    if ( GetMenuItems().GetCount() == pos + 1 &&
+                            previousItem != NULL &&
+                                previousItem->IsSeparator() )
                     {
                         ChangeMenuItemAttributes( MAC_WXHMENU( GetHMenu() ) , pos , kMenuItemAttrHidden, 0 );
                     }
@@ -544,7 +546,6 @@ void wxMenuBar::MacInstallMenuBar()
 #endif
        for (size_t i = 0; i < m_menus.GetCount(); i++)
       {
-        Str255     label;
         wxMenuItemList::Node *node;
         wxMenuItem *item;
         int pos ;