AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed use of deprecated functions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2006-03-15 08:50:46 +00:00
parent b1c6a00e63
commit 2c3ebf8be5
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/common/dcbase.cpp
View File

@ -885,13 +885,13 @@ void wxDCBase::DoDrawEllipticArcRot( wxCoord x, wxCoord y,
list.Append( (wxObject*) new wxPoint( x+w/2, y+h/2 ) ); list.Append( (wxObject*) new wxPoint( x+w/2, y+h/2 ) );
// copy list into array and delete list elements // copy list into array and delete list elements
int n = list.Number(); int n = list.GetCount();
wxPoint *points = new wxPoint[n]; wxPoint *points = new wxPoint[n];
int i = 0; int i = 0;
wxNode* node = 0; wxNode* node = 0;
for ( node = list.First(); node; node = node->Next(), i++ ) for ( node = list.GetFirst(); node; node = node->GetNext(), i++ )
{ {
wxPoint *point = (wxPoint *)node->Data(); wxPoint *point = (wxPoint *)node->GetData();
points[i].x = point->x; points[i].x = point->x;
points[i].y = point->y; points[i].y = point->y;
delete point; delete point;
@ -924,9 +924,9 @@ void wxDCBase::Rotate( wxList* points, double angle, wxPoint center )
double pi(M_PI); double pi(M_PI);
double dSinA = -sin(angle*2.0*pi/360.0); double dSinA = -sin(angle*2.0*pi/360.0);
double dCosA = cos(angle*2.0*pi/360.0); double dCosA = cos(angle*2.0*pi/360.0);
for ( wxNode* node = points->First(); node; node = node->Next() ) for ( wxNode* node = points->GetFirst(); node; node = node->GetNext() )
{ {
wxPoint* point = (wxPoint*)node->Data(); wxPoint* point = (wxPoint*)node->GetData();
// transform coordinates, if necessary // transform coordinates, if necessary
if( center.x ) point->x -= center.x; if( center.x ) point->x -= center.x;
@ -1062,14 +1062,14 @@ void wxDCBase::CalculateEllipticPoints( wxList* points,
bool bForceTurn = ( sq == eq && sa > ea ); bool bForceTurn = ( sq == eq && sa > ea );
while( !bReady ) while( !bReady )
{ {
for( wxNode *node = pointsarray[q].First(); node; node = node->Next() ) for( wxNode *node = pointsarray[q].GetFirst(); node; node = node->GetNext() )
{ {
// once: go to starting point in start quadrant // once: go to starting point in start quadrant
if( !bStarted && if( !bStarted &&
( (
( (wxPoint*) node->Data() )->x < xsa+1 && q <= 1 ( (wxPoint*) node->GetData() )->x < xsa+1 && q <= 1
|| ||
( (wxPoint*) node->Data() )->x > xsa-1 && q >= 2 ( (wxPoint*) node->GetData() )->x > xsa-1 && q >= 2
) )
) )
{ {
@ -1081,16 +1081,16 @@ void wxDCBase::CalculateEllipticPoints( wxList* points,
{ {
if( q != eq || bForceTurn if( q != eq || bForceTurn
|| ||
( (wxPoint*) node->Data() )->x > xea+1 && q <= 1 ( (wxPoint*) node->GetData() )->x > xea+1 && q <= 1
|| ||
( (wxPoint*) node->Data() )->x < xea-1 && q >= 2 ( (wxPoint*) node->GetData() )->x < xea-1 && q >= 2
) )
{ {
// copy point // copy point
wxPoint* pPoint = new wxPoint( *((wxPoint*) node->Data() ) ); wxPoint* pPoint = new wxPoint( *((wxPoint*) node->GetData() ) );
points->Append( (wxObject*) pPoint ); points->Append( (wxObject*) pPoint );
} }
else if( q == eq && !bForceTurn || ( (wxPoint*) node->Data() )->x == xea) else if( q == eq && !bForceTurn || ( (wxPoint*) node->GetData() )->x == xea)
{ {
bReady = true; bReady = true;
} }
@ -1106,9 +1106,9 @@ void wxDCBase::CalculateEllipticPoints( wxList* points,
// delete points // delete points
for( q = 0; q < 4; ++q ) for( q = 0; q < 4; ++q )
{ {
for( wxNode *node = pointsarray[q].First(); node; node = node->Next() ) for( wxNode *node = pointsarray[q].GetFirst(); node; node = node->GetNext() )
{ {
wxPoint *p = (wxPoint *)node->Data(); wxPoint *p = (wxPoint *)node->GetData();
delete p; delete p;
} }
} }
@ -1117,24 +1117,24 @@ void wxDCBase::CalculateEllipticPoints( wxList* points,
{ {
wxNode* node; wxNode* node;
// copy whole ellipse, wxPoints will be deleted outside // copy whole ellipse, wxPoints will be deleted outside
for( node = pointsarray[0].First(); node; node = node->Next() ) for( node = pointsarray[0].GetFirst(); node; node = node->GetNext() )
{ {
wxObject *p = node->Data(); wxObject *p = node->GetData();
points->Append( p ); points->Append( p );
} }
for( node = pointsarray[1].First(); node; node = node->Next() ) for( node = pointsarray[1].GetFirst(); node; node = node->GetNext() )
{ {
wxObject *p = node->Data(); wxObject *p = node->GetData();
points->Append( p ); points->Append( p );
} }
for( node = pointsarray[2].First(); node; node = node->Next() ) for( node = pointsarray[2].GetFirst(); node; node = node->GetNext() )
{ {
wxObject *p = node->Data(); wxObject *p = node->GetData();
points->Append( p ); points->Append( p );
} }
for( node = pointsarray[3].First(); node; node = node->Next() ) for( node = pointsarray[3].GetFirst(); node; node = node->GetNext() )
{ {
wxObject *p = node->Data(); wxObject *p = node->GetData();
points->Append( p ); points->Append( p );
} }
} // not iUseAngles } // not iUseAngles