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

14
src/common/dcbase.cpp
View File

@@ -73,7 +73,7 @@ void wxDCBase::DrawLines(const wxList *list, wxCoord xoffset, wxCoord yoffset)
wxPoint *points = new wxPoint[n];
int i = 0;
for ( wxNode *node = list->GetFirst(); node; node = node->GetNext(), i++ )
for ( wxList::compatibility_iterator node = list->GetFirst(); node; node = node->GetNext(), i++ )
{
wxPoint *point = (wxPoint *)node->GetData();
points[i].x = point->x;
@@ -94,7 +94,7 @@ void wxDCBase::DrawPolygon(const wxList *list,
wxPoint *points = new wxPoint[n];
int i = 0;
for ( wxNode *node = list->GetFirst(); node; node = node->GetNext(), i++ )
for ( wxList::compatibility_iterator node = list->GetFirst(); node; node = node->GetNext(), i++ )
{
wxPoint *point = (wxPoint *)node->GetData();
points[i].x = point->x;
@@ -131,7 +131,7 @@ void wxDCBase::DrawSpline(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoor
DrawSpline(&point_list);
for( wxNode *node = point_list.GetFirst(); node; node = node->GetNext() )
for( wxList::compatibility_iterator node = point_list.GetFirst(); node; node = node->GetNext() )
{
wxPoint *p = (wxPoint *)node->GetData();
delete p;
@@ -254,12 +254,12 @@ static bool wx_spline_add_point(double x, double y)
static void wx_spline_draw_point_array(wxDCBase *dc)
{
dc->DrawLines(&wx_spline_point_list, 0, 0 );
wxNode *node = wx_spline_point_list.GetFirst();
wxList::compatibility_iterator node = wx_spline_point_list.GetFirst();
while (node)
{
wxPoint *point = (wxPoint *)node->GetData();
delete point;
delete node;
wx_spline_point_list.Erase(node);
node = wx_spline_point_list.GetFirst();
}
}
@@ -272,7 +272,7 @@ void wxDCBase::DoDrawSpline( wxList *points )
double cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
double x1, y1, x2, y2;
wxNode *node = points->GetFirst();
wxList::compatibility_iterator node = points->GetFirst();
p = (wxPoint *)node->GetData();
x1 = p->x;
@@ -290,7 +290,7 @@ void wxDCBase::DoDrawSpline( wxList *points )
wx_spline_add_point(x1, y1);
while ((node = node->GetNext()) != NULL)
while ((node = node->GetNext()))
{
p = (wxPoint *)node->GetData();
x1 = x2;