corrected wxList::Node declarations

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

diff --git a/src/mac/accel.cpp b/src/mac/accel.cpp
index ebd4580eb1d2fead2552186cedf4f7735a656d0e..0623dc8dd504af42b604a1d22f89b4f6dbe7dd85 100644 (file)
--- a/src/mac/accel.cpp
+++ b/src/mac/accel.cpp
@@ -88,7 +88,7 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 {
     if (!Ok()) return -1;
 
-    wxwxAccelListNode *node = M_ACCELDATA->m_accels.GetFirst();
+    wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst();
     while (node)
     {
         wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->GetData();

diff --git a/src/mac/carbon/accel.cpp b/src/mac/carbon/accel.cpp
index ebd4580eb1d2fead2552186cedf4f7735a656d0e..0623dc8dd504af42b604a1d22f89b4f6dbe7dd85 100644 (file)
--- a/src/mac/carbon/accel.cpp
+++ b/src/mac/carbon/accel.cpp
@@ -88,7 +88,7 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 {
     if (!Ok()) return -1;
 
-    wxwxAccelListNode *node = M_ACCELDATA->m_accels.GetFirst();
+    wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst();
     while (node)
     {
         wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->GetData();

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 7064cf06a3eec4110d86e9626bbf464f6798ed27..2b39df62fcaaf29a005d98fbc7c87799041e2ab6 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -560,7 +560,7 @@ void wxMenuBar::MacInstallMenuBar()
        for (size_t i = 0; i < m_menus.GetCount(); i++)
        {
         Str255         label;
-        wxwxMenuItemListNode *node;
+        wxMenuItemList::Node *node;
         wxMenuItem *item;
         int pos ;
        wxMenu* menu = m_menus[i] , *subMenu = NULL ;
@@ -642,7 +642,7 @@ void wxMenuBar::MacInstallMenuBar()
                        for ( size_t i = 0 ; i < submenus.GetCount() ; ++i )
                        {
                            wxMenu* submenu = (wxMenu*) submenus[i] ;
-               wxwxMenuItemListNode *subnode;
+               wxMenuItemList::Node *subnode;
                wxMenuItem *subitem;
                int subpos ;
                 for ( subpos = 0 , subnode = submenu->GetMenuItems().GetFirst(); subnode; subnode = subnode->GetNext(), subpos++) 

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 3f85d6b4f00c11c88ca2d562f38e41e01e3389e0..aa01c95226560b477e361c8684164ad25aaf1fe2 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -195,7 +195,7 @@ bool wxToolBar::Realize()
     controlstyle.flags = kControlUseFontMask ;
     controlstyle.font = kControlFontSmallSystemFont ;
     
-    wxwxToolBarToolsListNode *node = m_tools.GetFirst();
+    wxToolBarToolsList::Node *node = m_tools.GetFirst();
     int noButtons = 0;
     int x = 0 ;
     int y = 0 ;
@@ -385,7 +385,7 @@ void wxToolBar::MacSuperChangedPosition()
     controlstyle.flags = kControlUseFontMask ;
     controlstyle.font = kControlFontSmallSystemFont ;
     
-    wxwxToolBarToolsListNode *node = m_tools.GetFirst();
+    wxToolBarToolsList::Node *node = m_tools.GetFirst();
     int noButtons = 0;
     int x = 0 ;
     wxSize toolSize = GetToolSize() ;

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 7064cf06a3eec4110d86e9626bbf464f6798ed27..2b39df62fcaaf29a005d98fbc7c87799041e2ab6 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -560,7 +560,7 @@ void wxMenuBar::MacInstallMenuBar()
        for (size_t i = 0; i < m_menus.GetCount(); i++)
        {
         Str255         label;
-        wxwxMenuItemListNode *node;
+        wxMenuItemList::Node *node;
         wxMenuItem *item;
         int pos ;
        wxMenu* menu = m_menus[i] , *subMenu = NULL ;
@@ -642,7 +642,7 @@ void wxMenuBar::MacInstallMenuBar()
                        for ( size_t i = 0 ; i < submenus.GetCount() ; ++i )
                        {
                            wxMenu* submenu = (wxMenu*) submenus[i] ;
-               wxwxMenuItemListNode *subnode;
+               wxMenuItemList::Node *subnode;
                wxMenuItem *subitem;
                int subpos ;
                 for ( subpos = 0 , subnode = submenu->GetMenuItems().GetFirst(); subnode; subnode = subnode->GetNext(), subpos++) 

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index 3f85d6b4f00c11c88ca2d562f38e41e01e3389e0..aa01c95226560b477e361c8684164ad25aaf1fe2 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -195,7 +195,7 @@ bool wxToolBar::Realize()
     controlstyle.flags = kControlUseFontMask ;
     controlstyle.font = kControlFontSmallSystemFont ;
     
-    wxwxToolBarToolsListNode *node = m_tools.GetFirst();
+    wxToolBarToolsList::Node *node = m_tools.GetFirst();
     int noButtons = 0;
     int x = 0 ;
     int y = 0 ;
@@ -385,7 +385,7 @@ void wxToolBar::MacSuperChangedPosition()
     controlstyle.flags = kControlUseFontMask ;
     controlstyle.font = kControlFontSmallSystemFont ;
     
-    wxwxToolBarToolsListNode *node = m_tools.GetFirst();
+    wxToolBarToolsList::Node *node = m_tools.GetFirst();
     int noButtons = 0;
     int x = 0 ;
     wxSize toolSize = GetToolSize() ;