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

STL-ification patch for wxMSW and wxGTK.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-10 19:55:12 +00:00
parent 6992d326eb
commit 222ed1d678
73 changed files with 668 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/tbarbase.cpp
View File

@@ -125,8 +125,6 @@ wxToolBarToolBase::~wxToolBarToolBase()
wxToolBarBase::wxToolBarBase()
{
// the list owns the pointers
m_tools.DeleteContents(TRUE);
m_xMargin = m_yMargin = 0;
m_maxRows = m_maxCols = 0;
@@ -224,7 +222,7 @@ wxToolBarToolBase *wxToolBarBase::InsertControl(size_t pos, wxControl *control)
wxControl *wxToolBarBase::FindControl( int id )
{
for ( wxToolBarToolsList::Node* node = m_tools.GetFirst();
for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
node;
node = node->GetNext() )
{
@@ -279,7 +277,7 @@ wxToolBarToolBase *wxToolBarBase::InsertSeparator(size_t pos)
wxToolBarToolBase *wxToolBarBase::RemoveTool(int id)
{
size_t pos = 0;
wxToolBarToolsList::Node *node;
wxToolBarToolsList::compatibility_iterator node;
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
if ( node->GetData()->GetId() == id )
@@ -301,10 +299,7 @@ wxToolBarToolBase *wxToolBarBase::RemoveTool(int id)
return (wxToolBarToolBase *)NULL;
}
// the node would delete the data, so set it to NULL to avoid this
node->SetData(NULL);
m_tools.DeleteNode(node);
m_tools.Erase(node);
return tool;
}
@@ -314,14 +309,15 @@ bool wxToolBarBase::DeleteToolByPos(size_t pos)
wxCHECK_MSG( pos < GetToolsCount(), FALSE,
_T("invalid position in wxToolBar::DeleteToolByPos()") );
wxToolBarToolsList::Node *node = m_tools.Item(pos);
wxToolBarToolsList::compatibility_iterator node = m_tools.Item(pos);
if ( !DoDeleteTool(pos, node->GetData()) )
{
return FALSE;
}
m_tools.DeleteNode(node);
delete node->GetData();
m_tools.Erase(node);
return TRUE;
}
@@ -329,7 +325,7 @@ bool wxToolBarBase::DeleteToolByPos(size_t pos)
bool wxToolBarBase::DeleteTool(int id)
{
size_t pos = 0;
wxToolBarToolsList::Node *node;
wxToolBarToolsList::compatibility_iterator node;
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
if ( node->GetData()->GetId() == id )
@@ -343,7 +339,8 @@ bool wxToolBarBase::DeleteTool(int id)
return FALSE;
}
m_tools.DeleteNode(node);
delete node->GetData();
m_tools.Erase(node);
return TRUE;
}
@@ -352,7 +349,7 @@ wxToolBarToolBase *wxToolBarBase::FindById(int id) const
{
wxToolBarToolBase *tool = (wxToolBarToolBase *)NULL;
for ( wxToolBarToolsList::Node *node = m_tools.GetFirst();
for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
node;
node = node->GetNext() )
{
@@ -371,7 +368,7 @@ wxToolBarToolBase *wxToolBarBase::FindById(int id) const
void wxToolBarBase::ClearTools()
{
m_tools.Clear();
WX_CLEAR_LIST(wxToolBarToolsList, m_tools);
}
bool wxToolBarBase::Realize()
@@ -381,6 +378,7 @@ bool wxToolBarBase::Realize()
wxToolBarBase::~wxToolBarBase()
{
WX_CLEAR_LIST(wxToolBarToolsList, m_tools);
}
// ----------------------------------------------------------------------------
@@ -460,7 +458,7 @@ void wxToolBarBase::SetToolClientData(int id, wxObject *clientData)
int wxToolBarBase::GetToolPos(int id) const
{
size_t pos = 0;
wxToolBarToolsList::Node *node;
wxToolBarToolsList::compatibility_iterator node;
for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
{
@@ -587,7 +585,7 @@ void wxToolBarBase::UpdateWindowUI(long flags)
wxEvtHandler* evtHandler = GetEventHandler() ;
for ( wxToolBarToolsList::Node* node = m_tools.GetFirst();
for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
node;
node = node->GetNext() )
{