TRUE not true, FALSE not false

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

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index e81e6de61a1a48f99d1ee1b930c1bf0d80ec81e4..7064cf06a3eec4110d86e9626bbf464f6798ed27 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -10,6 +10,11 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
+#ifdef __GNUG__
+#pragma implementation "menu.h"
+#pragma implementation "menuitem.h"
+#endif
+
 // ============================================================================
 // headers & declarations
 // ============================================================================
@@ -17,11 +22,6 @@
 // wxWindows headers
 // -----------------
 
-#ifdef __GNUG__
-#pragma implementation "menu.h"
-#pragma implementation "menuitem.h"
-#endif
-
 #include "wx/app.h"
 #include "wx/menu.h"
 #include "wx/menuitem.h"
@@ -560,7 +560,7 @@ void wxMenuBar::MacInstallMenuBar()
        for (size_t i = 0; i < m_menus.GetCount(); i++)
        {
         Str255         label;
-        wxNode *node;
+        wxwxMenuItemListNode *node;
         wxMenuItem *item;
         int pos ;
        wxMenu* menu = m_menus[i] , *subMenu = NULL ;
@@ -578,9 +578,9 @@ void wxMenuBar::MacInstallMenuBar()
                        DeleteMenuItem( mh , i ) ;
                    }
                                
-                       for (pos = 0 , node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) 
+                       for (pos = 0 , node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) 
                        {
-                               item = (wxMenuItem *)node->Data();
+                               item = (wxMenuItem *)node->GetData();
                                subMenu = item->GetSubMenu() ;
                                if (subMenu)                    
                                {
@@ -629,9 +629,9 @@ void wxMenuBar::MacInstallMenuBar()
                        UMASetMenuTitle( MAC_WXHMENU(menu->GetHMenu()) , label ) ;
                                wxArrayPtrVoid submenus ;
                                
-                       for (pos = 0, node = menu->GetMenuItems().First(); node; node = node->Next(), pos++) 
+                       for (pos = 0, node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++) 
                        {
-                               item = (wxMenuItem *)node->Data();
+                               item = (wxMenuItem *)node->GetData();
                                subMenu = item->GetSubMenu() ;
                                if (subMenu)                    
                                {
@@ -642,12 +642,12 @@ void wxMenuBar::MacInstallMenuBar()
                        for ( size_t i = 0 ; i < submenus.GetCount() ; ++i )
                        {
                            wxMenu* submenu = (wxMenu*) submenus[i] ;
-               wxNode *subnode;
+               wxwxMenuItemListNode *subnode;
                wxMenuItem *subitem;
                int subpos ;
-                for ( subpos = 0 , subnode = submenu->GetMenuItems().First(); subnode; subnode = subnode->Next(), subpos++) 
+                for ( subpos = 0 , subnode = submenu->GetMenuItems().GetFirst(); subnode; subnode = subnode->GetNext(), subpos++) 
                                {
-                                       subitem = (wxMenuItem *)subnode->Data();
+                                       subitem = (wxMenuItem *)subnode->GetData();
                                        wxMenu* itsSubMenu = subitem->GetSubMenu() ;
                                        if (itsSubMenu)                 
                                        {