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

sf patch #806451

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-09-15 12:28:11 +00:00
parent cafcf62a83
commit 216db41f96
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/samples/svg/svgtest.cpp
View File

@@ -217,7 +217,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
event.Skip(); event.Skip();
return ; return ;
} }
if ( m_children.Number () < 1 ) if ( m_children.GetCount () < 1 )
{ {
event.Skip(); event.Skip();
return ; return ;
@@ -229,7 +229,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
while ( pNode ) while ( pNode )
{ {
pNext = pNode -> GetNext (); pNext = pNode -> GetNext ();
pChild = (MyChild*) pNode -> Data (); pChild = (MyChild*) pNode -> GetData ();
if (pChild -> Close ()) if (pChild -> Close ())
{ {
delete pNode ; delete pNode ;
@@ -268,7 +268,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
wxPoint(-1, -1), wxSize(-1, -1), wxPoint(-1, -1), wxSize(-1, -1),
wxDEFAULT_FRAME_STYLE ) ) ; wxDEFAULT_FRAME_STYLE ) ) ;
subframe = (MyChild *) m_children.GetLast() -> Data (); subframe = (MyChild *) m_children.GetLast() -> GetData ();
wxString title; wxString title;
title.Printf(wxT("SVG Test Window %d"), nWinCreated ); title.Printf(wxT("SVG Test Window %d"), nWinCreated );
// counts number of children previously, even if now closed // counts number of children previously, even if now closed
@@ -466,16 +466,16 @@ void MyCanvas::OnDraw(wxDC& dc)
case 3 : case 3 :
// four arcs start and end points, center // four arcs start and end points, center
dc.SetBrush(*wxGREEN_BRUSH); dc.SetBrush(*wxGREEN_BRUSH);
dc.DrawArc ( 200,300, 370,230, 300.0,300.0 ); dc.DrawArc ( 200,300, 370,230, 300,300 );
dc.SetBrush(*wxBLUE_BRUSH); dc.SetBrush(*wxBLUE_BRUSH);
dc.DrawArc ( 270-50, 270-86, 270-86, 270-50, 270.0,270.0 ); dc.DrawArc ( 270-50, 270-86, 270-86, 270-50, 270,270 );
dc.SetDeviceOrigin(-10,-10); dc.SetDeviceOrigin(-10,-10);
dc.DrawArc ( 270-50, 270-86, 270-86, 270-50, 270.0,270.0 ); dc.DrawArc ( 270-50, 270-86, 270-86, 270-50, 270,270 );
dc.SetDeviceOrigin(0,0); dc.SetDeviceOrigin(0,0);
wP.SetColour (_T("CADET BLUE")); wP.SetColour (_T("CADET BLUE"));
dc.SetPen(wP); dc.SetPen(wP);
dc.DrawArc ( 75,125, 110, 40, 75.0, 75.0 ); dc.DrawArc ( 75,125, 110, 40, 75, 75 );
wP.SetColour (_T("SALMON")); wP.SetColour (_T("SALMON"));
dc.SetPen(wP); dc.SetPen(wP);

4
contrib/src/svg/dcsvg.cpp
View File

@@ -229,13 +229,13 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y,
// wxT("upper left") and wxT("upper right") // wxT("upper left") and wxT("upper right")
CalcBoundingBox(x, y); CalcBoundingBox(x, y);
CalcBoundingBox(x + w*cos(rad), y - h*sin(rad)); CalcBoundingBox((wxCoord)(x + w*cos(rad)), (wxCoord)(y - h*sin(rad)));
// wxT("bottom left") and wxT("bottom right") // wxT("bottom left") and wxT("bottom right")
x += (wxCoord)(h*sin(rad)); x += (wxCoord)(h*sin(rad));
y += (wxCoord)(h*cos(rad)); y += (wxCoord)(h*cos(rad));
CalcBoundingBox(x, y); CalcBoundingBox(x, y);
CalcBoundingBox(x + h*sin(rad), y + h*cos(rad)); CalcBoundingBox((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad)));
if (m_backgroundMode == wxSOLID) if (m_backgroundMode == wxSOLID)
{ {

14
samples/svg/svgtest.cpp
View File

@@ -217,7 +217,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
event.Skip(); event.Skip();
return ; return ;
} }
if ( m_children.Number () < 1 ) if ( m_children.GetCount () < 1 )
{ {
event.Skip(); event.Skip();
return ; return ;
@@ -229,7 +229,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
while ( pNode ) while ( pNode )
{ {
pNext = pNode -> GetNext (); pNext = pNode -> GetNext ();
pChild = (MyChild*) pNode -> Data (); pChild = (MyChild*) pNode -> GetData ();
if (pChild -> Close ()) if (pChild -> Close ())
{ {
delete pNode ; delete pNode ;
@@ -268,7 +268,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
wxPoint(-1, -1), wxSize(-1, -1), wxPoint(-1, -1), wxSize(-1, -1),
wxDEFAULT_FRAME_STYLE ) ) ; wxDEFAULT_FRAME_STYLE ) ) ;
subframe = (MyChild *) m_children.GetLast() -> Data (); subframe = (MyChild *) m_children.GetLast() -> GetData ();
wxString title; wxString title;
title.Printf(wxT("SVG Test Window %d"), nWinCreated ); title.Printf(wxT("SVG Test Window %d"), nWinCreated );
// counts number of children previously, even if now closed // counts number of children previously, even if now closed
@@ -466,16 +466,16 @@ void MyCanvas::OnDraw(wxDC& dc)
case 3 : case 3 :
// four arcs start and end points, center // four arcs start and end points, center
dc.SetBrush(*wxGREEN_BRUSH); dc.SetBrush(*wxGREEN_BRUSH);
dc.DrawArc ( 200,300, 370,230, 300.0,300.0 ); dc.DrawArc ( 200,300, 370,230, 300,300 );
dc.SetBrush(*wxBLUE_BRUSH); dc.SetBrush(*wxBLUE_BRUSH);
dc.DrawArc ( 270-50, 270-86, 270-86, 270-50, 270.0,270.0 ); dc.DrawArc ( 270-50, 270-86, 270-86, 270-50, 270,270 );
dc.SetDeviceOrigin(-10,-10); dc.SetDeviceOrigin(-10,-10);
dc.DrawArc ( 270-50, 270-86, 270-86, 270-50, 270.0,270.0 ); dc.DrawArc ( 270-50, 270-86, 270-86, 270-50, 270,270 );
dc.SetDeviceOrigin(0,0); dc.SetDeviceOrigin(0,0);
wP.SetColour (_T("CADET BLUE")); wP.SetColour (_T("CADET BLUE"));
dc.SetPen(wP); dc.SetPen(wP);
dc.DrawArc ( 75,125, 110, 40, 75.0, 75.0 ); dc.DrawArc ( 75,125, 110, 40, 75, 75 );
wP.SetColour (_T("SALMON")); wP.SetColour (_T("SALMON"));
dc.SetPen(wP); dc.SetPen(wP);

4
src/common/dcsvg.cpp
View File

@@ -229,13 +229,13 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y,
// wxT("upper left") and wxT("upper right") // wxT("upper left") and wxT("upper right")
CalcBoundingBox(x, y); CalcBoundingBox(x, y);
CalcBoundingBox(x + w*cos(rad), y - h*sin(rad)); CalcBoundingBox((wxCoord)(x + w*cos(rad)), (wxCoord)(y - h*sin(rad)));
// wxT("bottom left") and wxT("bottom right") // wxT("bottom left") and wxT("bottom right")
x += (wxCoord)(h*sin(rad)); x += (wxCoord)(h*sin(rad));
y += (wxCoord)(h*cos(rad)); y += (wxCoord)(h*cos(rad));
CalcBoundingBox(x, y); CalcBoundingBox(x, y);
CalcBoundingBox(x + h*sin(rad), y + h*cos(rad)); CalcBoundingBox((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad)));
if (m_backgroundMode == wxSOLID) if (m_backgroundMode == wxSOLID)
{ {