wxX11 and wxMotif STL-ification, part 1. it does not compile.
yet, but keeps the diff between my local copy and HEAD < 4000 lines... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -281,7 +281,7 @@ bool wxToolBar::Realize()
|
||||
Pixmap pixmap, insensPixmap;
|
||||
wxBitmap bmp, insensBmp;
|
||||
|
||||
wxToolBarToolsList::Node *node = m_tools.GetFirst();
|
||||
wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
|
||||
while ( node )
|
||||
{
|
||||
wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
|
||||
@@ -507,7 +507,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
|
||||
int packing = GetToolPacking();
|
||||
int offset = 0;
|
||||
|
||||
for( wxToolBarToolsList::Node *node = m_tools.GetFirst();
|
||||
for( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
|
||||
node; node = node->GetNext() )
|
||||
{
|
||||
wxToolBarTool *t = (wxToolBarTool*)node->GetData();
|
||||
@@ -644,7 +644,7 @@ void wxToolBar::DoSetSize(int x, int y, int width, int height, int sizeFlags)
|
||||
|
||||
wxToolBarToolBase *wxToolBar::FindToolByWidget(WXWidget w) const
|
||||
{
|
||||
wxToolBarToolsList::Node* node = m_tools.GetFirst();
|
||||
wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
|
||||
while ( node )
|
||||
{
|
||||
wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
|
||||
|
Reference in New Issue
Block a user