corrected wxList::Node declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -88,7 +88,7 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
|
|||||||
{
|
{
|
||||||
if (!Ok()) return -1;
|
if (!Ok()) return -1;
|
||||||
|
|
||||||
wxwxAccelListNode *node = M_ACCELDATA->m_accels.GetFirst();
|
wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst();
|
||||||
while (node)
|
while (node)
|
||||||
{
|
{
|
||||||
wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->GetData();
|
wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->GetData();
|
||||||
|
@@ -88,7 +88,7 @@ int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
|
|||||||
{
|
{
|
||||||
if (!Ok()) return -1;
|
if (!Ok()) return -1;
|
||||||
|
|
||||||
wxwxAccelListNode *node = M_ACCELDATA->m_accels.GetFirst();
|
wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst();
|
||||||
while (node)
|
while (node)
|
||||||
{
|
{
|
||||||
wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->GetData();
|
wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->GetData();
|
||||||
|
@@ -560,7 +560,7 @@ void wxMenuBar::MacInstallMenuBar()
|
|||||||
for (size_t i = 0; i < m_menus.GetCount(); i++)
|
for (size_t i = 0; i < m_menus.GetCount(); i++)
|
||||||
{
|
{
|
||||||
Str255 label;
|
Str255 label;
|
||||||
wxwxMenuItemListNode *node;
|
wxMenuItemList::Node *node;
|
||||||
wxMenuItem *item;
|
wxMenuItem *item;
|
||||||
int pos ;
|
int pos ;
|
||||||
wxMenu* menu = m_menus[i] , *subMenu = NULL ;
|
wxMenu* menu = m_menus[i] , *subMenu = NULL ;
|
||||||
@@ -642,7 +642,7 @@ void wxMenuBar::MacInstallMenuBar()
|
|||||||
for ( size_t i = 0 ; i < submenus.GetCount() ; ++i )
|
for ( size_t i = 0 ; i < submenus.GetCount() ; ++i )
|
||||||
{
|
{
|
||||||
wxMenu* submenu = (wxMenu*) submenus[i] ;
|
wxMenu* submenu = (wxMenu*) submenus[i] ;
|
||||||
wxwxMenuItemListNode *subnode;
|
wxMenuItemList::Node *subnode;
|
||||||
wxMenuItem *subitem;
|
wxMenuItem *subitem;
|
||||||
int subpos ;
|
int subpos ;
|
||||||
for ( subpos = 0 , subnode = submenu->GetMenuItems().GetFirst(); subnode; subnode = subnode->GetNext(), subpos++)
|
for ( subpos = 0 , subnode = submenu->GetMenuItems().GetFirst(); subnode; subnode = subnode->GetNext(), subpos++)
|
||||||
|
@@ -195,7 +195,7 @@ bool wxToolBar::Realize()
|
|||||||
controlstyle.flags = kControlUseFontMask ;
|
controlstyle.flags = kControlUseFontMask ;
|
||||||
controlstyle.font = kControlFontSmallSystemFont ;
|
controlstyle.font = kControlFontSmallSystemFont ;
|
||||||
|
|
||||||
wxwxToolBarToolsListNode *node = m_tools.GetFirst();
|
wxToolBarToolsList::Node *node = m_tools.GetFirst();
|
||||||
int noButtons = 0;
|
int noButtons = 0;
|
||||||
int x = 0 ;
|
int x = 0 ;
|
||||||
int y = 0 ;
|
int y = 0 ;
|
||||||
@@ -385,7 +385,7 @@ void wxToolBar::MacSuperChangedPosition()
|
|||||||
controlstyle.flags = kControlUseFontMask ;
|
controlstyle.flags = kControlUseFontMask ;
|
||||||
controlstyle.font = kControlFontSmallSystemFont ;
|
controlstyle.font = kControlFontSmallSystemFont ;
|
||||||
|
|
||||||
wxwxToolBarToolsListNode *node = m_tools.GetFirst();
|
wxToolBarToolsList::Node *node = m_tools.GetFirst();
|
||||||
int noButtons = 0;
|
int noButtons = 0;
|
||||||
int x = 0 ;
|
int x = 0 ;
|
||||||
wxSize toolSize = GetToolSize() ;
|
wxSize toolSize = GetToolSize() ;
|
||||||
|
@@ -560,7 +560,7 @@ void wxMenuBar::MacInstallMenuBar()
|
|||||||
for (size_t i = 0; i < m_menus.GetCount(); i++)
|
for (size_t i = 0; i < m_menus.GetCount(); i++)
|
||||||
{
|
{
|
||||||
Str255 label;
|
Str255 label;
|
||||||
wxwxMenuItemListNode *node;
|
wxMenuItemList::Node *node;
|
||||||
wxMenuItem *item;
|
wxMenuItem *item;
|
||||||
int pos ;
|
int pos ;
|
||||||
wxMenu* menu = m_menus[i] , *subMenu = NULL ;
|
wxMenu* menu = m_menus[i] , *subMenu = NULL ;
|
||||||
@@ -642,7 +642,7 @@ void wxMenuBar::MacInstallMenuBar()
|
|||||||
for ( size_t i = 0 ; i < submenus.GetCount() ; ++i )
|
for ( size_t i = 0 ; i < submenus.GetCount() ; ++i )
|
||||||
{
|
{
|
||||||
wxMenu* submenu = (wxMenu*) submenus[i] ;
|
wxMenu* submenu = (wxMenu*) submenus[i] ;
|
||||||
wxwxMenuItemListNode *subnode;
|
wxMenuItemList::Node *subnode;
|
||||||
wxMenuItem *subitem;
|
wxMenuItem *subitem;
|
||||||
int subpos ;
|
int subpos ;
|
||||||
for ( subpos = 0 , subnode = submenu->GetMenuItems().GetFirst(); subnode; subnode = subnode->GetNext(), subpos++)
|
for ( subpos = 0 , subnode = submenu->GetMenuItems().GetFirst(); subnode; subnode = subnode->GetNext(), subpos++)
|
||||||
|
@@ -195,7 +195,7 @@ bool wxToolBar::Realize()
|
|||||||
controlstyle.flags = kControlUseFontMask ;
|
controlstyle.flags = kControlUseFontMask ;
|
||||||
controlstyle.font = kControlFontSmallSystemFont ;
|
controlstyle.font = kControlFontSmallSystemFont ;
|
||||||
|
|
||||||
wxwxToolBarToolsListNode *node = m_tools.GetFirst();
|
wxToolBarToolsList::Node *node = m_tools.GetFirst();
|
||||||
int noButtons = 0;
|
int noButtons = 0;
|
||||||
int x = 0 ;
|
int x = 0 ;
|
||||||
int y = 0 ;
|
int y = 0 ;
|
||||||
@@ -385,7 +385,7 @@ void wxToolBar::MacSuperChangedPosition()
|
|||||||
controlstyle.flags = kControlUseFontMask ;
|
controlstyle.flags = kControlUseFontMask ;
|
||||||
controlstyle.font = kControlFontSmallSystemFont ;
|
controlstyle.font = kControlFontSmallSystemFont ;
|
||||||
|
|
||||||
wxwxToolBarToolsListNode *node = m_tools.GetFirst();
|
wxToolBarToolsList::Node *node = m_tools.GetFirst();
|
||||||
int noButtons = 0;
|
int noButtons = 0;
|
||||||
int x = 0 ;
|
int x = 0 ;
|
||||||
wxSize toolSize = GetToolSize() ;
|
wxSize toolSize = GetToolSize() ;
|
||||||
|
Reference in New Issue
Block a user