adopting correct implementation virtualization for Do/GradientFillConcentric

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

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 98e922fff744c37493fc0b8ec03ad96d218ae134..4ddb6a0e5adfd8ee8cb7624a3d94b5803a751ca5 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -168,7 +168,8 @@ public:
     void GradientFillConcentric(const wxRect& rect,
                                 const wxColour& initialColour,
                                 const wxColour& destColour,
     void GradientFillConcentric(const wxRect& rect,
                                 const wxColour& initialColour,
                                 const wxColour& destColour,

-                                const wxPoint& circleCenter);
+                                const wxPoint& circleCenter)
+        { DoGradientFillConcentric(rect, initialColour, destColour, circleCenter); }

 
     // fill the area specified by rect with a linear gradient
     void GradientFillLinear(const wxRect& rect,
 
     // fill the area specified by rect with a linear gradient
     void GradientFillLinear(const wxRect& rect,


@@ -658,6 +659,11 @@ protected:
                                       const wxColour& destColour,
                                       wxDirection nDirection = wxEAST);
 
                                       const wxColour& destColour,
                                       wxDirection nDirection = wxEAST);
 

+    virtual void DoGradientFillConcentric(const wxRect& rect,
+                                        const wxColour& initialColour,
+                                        const wxColour& destColour,
+                                        const wxPoint& circleCenter);
+

     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const = 0;
 
     virtual void DoDrawPoint(wxCoord x, wxCoord y) = 0;
     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const = 0;
 
     virtual void DoDrawPoint(wxCoord x, wxCoord y) = 0;

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index ef8918bbb5e514879a1777bb9118da893497f3b3..994dfcee37a437e5d23fdfdeb19e3b05181f00fa 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -776,7 +776,7 @@ void wxDCBase::DoGradientFillLinear(const wxRect& rect,
     SetPen(oldPen);
 }
 
     SetPen(oldPen);
 }
 

-void wxDCBase::GradientFillConcentric(const wxRect& rect,
+void wxDCBase::DoGradientFillConcentric(const wxRect& rect,

                                       const wxColour& initialColour,
                                       const wxColour& destColour,
                                       const wxPoint& circleCenter)
                                       const wxColour& initialColour,
                                       const wxColour& destColour,
                                       const wxPoint& circleCenter)