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

Added support for compiling with wxUSE_STL set to 1.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2004-11-28 18:39:30 +00:00
parent c6efd6e0ec
commit 2461cfa0d9
10 changed files with 208 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/os2/toolbar.cpp
View File

@@ -445,11 +445,11 @@ bool wxToolBar::Realize()
//
// Find the maximum tool width and height
//
wxToolBarToolsList::Node* pNode = m_tools.GetFirst();
wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
while (pNode )
while (node )
{
wxToolBarTool* pTool = (wxToolBarTool *)pNode->GetData();
wxToolBarTool* pTool = (wxToolBarTool *)node->GetData();
if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
{
@@ -470,7 +470,7 @@ bool wxToolBar::Realize()
if (pTool->GetHeight() > nMaxToolHeight)
nMaxToolHeight = pTool->GetHeight();
}
pNode = pNode->GetNext();
node = node->GetNext();
}
wxCoord vTbWidth = 0L;
@@ -497,10 +497,10 @@ bool wxToolBar::Realize()
int nSeparatorSize = m_toolSeparation;
pNode = m_tools.GetFirst();
while (pNode)
node = m_tools.GetFirst();
while (node)
{
wxToolBarTool* pTool = (wxToolBarTool *)pNode->GetData();
wxToolBarTool* pTool = (wxToolBarTool *)node->GetData();
if (pTool->IsSeparator())
{
@@ -567,7 +567,7 @@ bool wxToolBar::Realize()
if (m_vLastY > m_maxHeight)
m_maxHeight = m_vLastY;
pNode = pNode->GetNext();
node = node->GetNext();
}
if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
@@ -603,11 +603,11 @@ void wxToolBar::OnPaint (
nCount++;
::WinFillRect(vDc.GetHPS(), &vDc.m_vRclPaint, GetBackgroundColour().GetPixel());
for ( wxToolBarToolsList::Node* pNode = m_tools.GetFirst();
pNode;
pNode = pNode->GetNext() )
for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
node;
node = node->GetNext() )
{
wxToolBarTool* pTool = (wxToolBarTool*)pNode->GetData();
wxToolBarTool* pTool = (wxToolBarTool*)node->GetData();
if (pTool->IsButton() )
DrawTool(vDc, pTool);
@@ -976,10 +976,10 @@ wxToolBarToolBase* wxToolBar::FindToolForPosition(
,&vTBarHeight
);
vY = vTBarHeight - vY;
wxToolBarToolsList::Node* pNode = m_tools.GetFirst();
while (pNode)
wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
while (node)
{
wxToolBarTool* pTool = (wxToolBarTool *)pNode->GetData();
wxToolBarTool* pTool = (wxToolBarTool *)node->GetData();
if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsNull())
{
@@ -1001,7 +1001,7 @@ wxToolBarToolBase* wxToolBar::FindToolForPosition(
return pTool;
}
}
pNode = pNode->GetNext();
node = node->GetNext();
}
return (wxToolBarToolBase *)NULL;
} // end of wxToolBar::FindToolForPosition