Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated source to not use deprecated wxList methods

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2003-01-14 07:01:22 +00:00
parent 8baeca5b24
commit eb22f2a6dc
30 changed files with 192 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/mac/carbon/menu.cpp
View File

@@ -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)
{