sf patch #806451

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/svg/svgtest.cpp b/contrib/samples/svg/svgtest.cpp
index b16331b2a7e12e0e3aef1132a2c402d44a4c1837..0ab198d87cd095ecf55186a264f865f27bdf4513 100644 (file)
--- a/contrib/samples/svg/svgtest.cpp
+++ b/contrib/samples/svg/svgtest.cpp
@@ -217,7 +217,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
         event.Skip();
         return ;
     }
-    if ( m_children.Number () < 1 )
+    if ( m_children.GetCount () < 1 )
     {
         event.Skip();
         return ;
@@ -229,7 +229,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
     while ( pNode )
     {
         pNext = pNode -> GetNext ();
-        pChild = (MyChild*) pNode -> Data ();
+        pChild = (MyChild*) pNode -> GetData ();
         if (pChild -> Close ())
         {
             delete pNode ;
@@ -268,7 +268,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
         wxPoint(-1, -1), wxSize(-1, -1),
         wxDEFAULT_FRAME_STYLE )   ) ;
 
-    subframe = (MyChild *) m_children.GetLast() -> Data ();
+    subframe = (MyChild *) m_children.GetLast() -> GetData ();
     wxString title;
     title.Printf(wxT("SVG Test Window %d"), nWinCreated );
     // counts number of children previously, even if now closed
@@ -466,16 +466,16 @@ void MyCanvas::OnDraw(wxDC& dc)
         case 3 :
             // four arcs start and end points, center
             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.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.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);
 
             wP.SetColour (_T("CADET BLUE"));
             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"));
             dc.SetPen(wP);

diff --git a/contrib/src/svg/dcsvg.cpp b/contrib/src/svg/dcsvg.cpp
index 73654c6ff92676e05fffff8ec0ddc6346095ae4a..3369f14b01c1db469364fd05a8dab26f93515d80 100644 (file)
--- a/contrib/src/svg/dcsvg.cpp
+++ b/contrib/src/svg/dcsvg.cpp
@@ -229,13 +229,13 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y,
 
     // wxT("upper left") and wxT("upper right")
     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")
     x += (wxCoord)(h*sin(rad));
     y += (wxCoord)(h*cos(rad));
     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)
     {

diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index b16331b2a7e12e0e3aef1132a2c402d44a4c1837..0ab198d87cd095ecf55186a264f865f27bdf4513 100644 (file)
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -217,7 +217,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
         event.Skip();
         return ;
     }
-    if ( m_children.Number () < 1 )
+    if ( m_children.GetCount () < 1 )
     {
         event.Skip();
         return ;
@@ -229,7 +229,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
     while ( pNode )
     {
         pNext = pNode -> GetNext ();
-        pChild = (MyChild*) pNode -> Data ();
+        pChild = (MyChild*) pNode -> GetData ();
         if (pChild -> Close ())
         {
             delete pNode ;
@@ -268,7 +268,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
         wxPoint(-1, -1), wxSize(-1, -1),
         wxDEFAULT_FRAME_STYLE )   ) ;
 
-    subframe = (MyChild *) m_children.GetLast() -> Data ();
+    subframe = (MyChild *) m_children.GetLast() -> GetData ();
     wxString title;
     title.Printf(wxT("SVG Test Window %d"), nWinCreated );
     // counts number of children previously, even if now closed
@@ -466,16 +466,16 @@ void MyCanvas::OnDraw(wxDC& dc)
         case 3 :
             // four arcs start and end points, center
             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.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.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);
 
             wP.SetColour (_T("CADET BLUE"));
             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"));
             dc.SetPen(wP);

diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index 73654c6ff92676e05fffff8ec0ddc6346095ae4a..3369f14b01c1db469364fd05a8dab26f93515d80 100644 (file)
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -229,13 +229,13 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y,
 
     // wxT("upper left") and wxT("upper right")
     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")
     x += (wxCoord)(h*sin(rad));
     y += (wxCoord)(h*cos(rad));
     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)
     {