From: Vadim Zeitlin Date: Thu, 8 May 2008 14:13:15 +0000 (+0000) Subject: don't override DoDrawSpline() under CE at all instead of overriding it and then alway... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3e9db38eafb71bbbfeaf92654c992d2f41faaf1a don't override DoDrawSpline() under CE at all instead of overriding it and then always forwarding to the base class version git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h index b031941f5e..a4f6922d84 100644 --- a/include/wx/msw/dc.h +++ b/include/wx/msw/dc.h @@ -199,7 +199,7 @@ public: double radius); virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); -#if wxUSE_SPLINES +#if wxUSE_SPLINES && !defined(__WXWINCE__) virtual void DoDrawSpline(const wxPointList *points); #endif diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 5dbd1f291f..e4b14e7c81 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -1083,13 +1083,9 @@ void wxMSWDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord hei CalcBoundingBox(x2, y2); } -#if wxUSE_SPLINES +#if wxUSE_SPLINES && !defined(__WXWINCE__) void wxMSWDCImpl::DoDrawSpline(const wxPointList *points) { -#ifdef __WXWINCE__ - // WinCE does not support ::PolyBezier so use generic version - wxDCImpl::DoDrawSpline(points); -#else // quadratic b-spline to cubic bezier spline conversion // // quadratic spline with control points P0,P1,P2 @@ -1178,9 +1174,8 @@ void wxMSWDCImpl::DoDrawSpline(const wxPointList *points) ::PolyBezier( GetHdc(), lppt, bezier_pos ); free(lppt); -#endif } -#endif +#endif // wxUSE_SPLINES // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows void wxMSWDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)