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

don't override DoDrawSpline() under CE at all instead of overriding it and then always forwarding to the base class version

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-05-08 14:13:15 +00:00
parent 7210c3a12c
commit 3e9db38eaf
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/dc.h
View File

@@ -199,7 +199,7 @@ public:
double radius); double radius);
virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); 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); virtual void DoDrawSpline(const wxPointList *points);
#endif #endif

9
src/msw/dc.cpp
View File

@@ -1083,13 +1083,9 @@ void wxMSWDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord hei
CalcBoundingBox(x2, y2); CalcBoundingBox(x2, y2);
} }
#if wxUSE_SPLINES #if wxUSE_SPLINES && !defined(__WXWINCE__)
void wxMSWDCImpl::DoDrawSpline(const wxPointList *points) 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 b-spline to cubic bezier spline conversion
// //
// quadratic spline with control points P0,P1,P2 // quadratic spline with control points P0,P1,P2
@@ -1178,9 +1174,8 @@ void wxMSWDCImpl::DoDrawSpline(const wxPointList *points)
::PolyBezier( GetHdc(), lppt, bezier_pos ); ::PolyBezier( GetHdc(), lppt, bezier_pos );
free(lppt); free(lppt);
#endif
} }
#endif #endif // wxUSE_SPLINES
// Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows // 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) void wxMSWDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)