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

Use new parameter names in the existing CreateRadialGradientBrush methods too

Browse Source
This commit is contained in:
Robin Dunn
2019-08-27 18:02:19 -07:00
committed by Robin Dunn
parent c79085b54d
commit f7896d4dff
8 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/graphics.h
View File

@@ -637,14 +637,14 @@ public:
// on a circle around (xc,yc) with the given radius; the colours may be // on a circle around (xc,yc) with the given radius; the colours may be
// specified by just the two extremes or the full array of gradient stops // specified by just the two extremes or the full array of gradient stops
wxGraphicsBrush wxGraphicsBrush
CreateRadialGradientBrush(wxDouble xo, wxDouble yo, CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble radius, wxDouble endX, wxDouble endY, wxDouble radius,
const wxColour& oColor, const wxColour& cColor, const wxColour& oColor, const wxColour& cColor,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) const; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) const;
wxGraphicsBrush wxGraphicsBrush
CreateRadialGradientBrush(wxDouble xo, wxDouble yo, CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble radius, wxDouble endX, wxDouble endY, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) const; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) const;
@@ -1026,8 +1026,8 @@ public:
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) = 0; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) = 0;
virtual wxGraphicsBrush virtual wxGraphicsBrush
CreateRadialGradientBrush(wxDouble xo, wxDouble yo, CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) = 0; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) = 0;

16
interface/wx/graphics.h
View File

@@ -659,8 +659,8 @@ public:
/** /**
Creates a native brush with a radial gradient. Creates a native brush with a radial gradient.
The brush originates at (@a xo, @a yc) and ends on a circle around The brush originates at (@a startX, @a startY) and ends on a circle around
(@a xc, @a yc) with the given @a radius. (@a endX, @a endY) with the given @a radius.
The gradient may be specified either by its start and end colours @a The gradient may be specified either by its start and end colours @a
oColor and @a cColor or by a full set of gradient @a stops. oColor and @a cColor or by a full set of gradient @a stops.
@@ -668,8 +668,8 @@ public:
The version taking wxGraphicsGradientStops is new in wxWidgets 2.9.1. The version taking wxGraphicsGradientStops is new in wxWidgets 2.9.1.
*/ */
virtual wxGraphicsBrush virtual wxGraphicsBrush
CreateRadialGradientBrush(wxDouble xo, wxDouble yo, CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxColour& oColor, const wxColour& oColor,
const wxColour& cColor, const wxColour& cColor,
@@ -679,8 +679,8 @@ public:
@overload @overload
*/ */
virtual wxGraphicsBrush virtual wxGraphicsBrush
CreateRadialGradientBrush(wxDouble xo, wxDouble yo, CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) = 0; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) = 0;
@@ -1490,8 +1490,8 @@ public:
Stops support is new since wxWidgets 2.9.1, previously only the start Stops support is new since wxWidgets 2.9.1, previously only the start
and end colours could be specified. and end colours could be specified.
*/ */
virtual wxGraphicsBrush CreateRadialGradientBrush(wxDouble xo, wxDouble yo, virtual wxGraphicsBrush CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) = 0; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) = 0;

16
src/common/graphcmn.cpp
View File

@@ -913,15 +913,15 @@ wxGraphicsContext::CreateLinearGradientBrush(
wxGraphicsBrush wxGraphicsBrush
wxGraphicsContext::CreateRadialGradientBrush( wxGraphicsContext::CreateRadialGradientBrush(
wxDouble xo, wxDouble yo, wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble radius, wxDouble endX, wxDouble endY, wxDouble radius,
const wxColour &oColor, const wxColour &cColor, const wxColour &oColor, const wxColour &cColor,
const wxGraphicsMatrix& matrix) const const wxGraphicsMatrix& matrix) const
{ {
return GetRenderer()->CreateRadialGradientBrush return GetRenderer()->CreateRadialGradientBrush
( (
xo, yo, startX, startY,
xc, yc, radius, endX, endY, radius,
wxGraphicsGradientStops(oColor, cColor), wxGraphicsGradientStops(oColor, cColor),
matrix matrix
); );
@@ -929,15 +929,15 @@ wxGraphicsContext::CreateRadialGradientBrush(
wxGraphicsBrush wxGraphicsBrush
wxGraphicsContext::CreateRadialGradientBrush( wxGraphicsContext::CreateRadialGradientBrush(
wxDouble xo, wxDouble yo, wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble radius, wxDouble endX, wxDouble endY, wxDouble radius,
const wxGraphicsGradientStops& gradientStops, const wxGraphicsGradientStops& gradientStops,
const wxGraphicsMatrix& matrix) const const wxGraphicsMatrix& matrix) const
{ {
return GetRenderer()->CreateRadialGradientBrush return GetRenderer()->CreateRadialGradientBrush
( (
xo, yo, startX, startY,
xc, yc, radius, endX, endY, radius,
gradientStops, gradientStops,
matrix matrix
); );

20
src/generic/graphicc.cpp
View File

@@ -264,8 +264,8 @@ public:
wxDouble x2, wxDouble y2, wxDouble x2, wxDouble y2,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix); const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix);
void CreateRadialGradientPattern(wxDouble xo, wxDouble yo, void CreateRadialGradientPattern(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble radius, wxDouble endX, wxDouble endY, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix); const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix);
@@ -765,13 +765,13 @@ wxCairoPenBrushBaseData::CreateLinearGradientPattern(wxDouble x1, wxDouble y1,
} }
void void
wxCairoPenBrushBaseData::CreateRadialGradientPattern(wxDouble xo, wxDouble yo, wxCairoPenBrushBaseData::CreateRadialGradientPattern(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix) const wxGraphicsMatrix& matrix)
{ {
m_pattern = cairo_pattern_create_radial(xo,yo,0.0,xc,yc,radius); m_pattern = cairo_pattern_create_radial(startX,startY,0.0,endX,endY,radius);
if (! matrix.IsNull()) if (! matrix.IsNull())
{ {
@@ -2997,8 +2997,8 @@ public :
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE;
virtual wxGraphicsBrush virtual wxGraphicsBrush
CreateRadialGradientBrush(wxDouble xo, wxDouble yo, CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE;
@@ -3201,15 +3201,15 @@ wxCairoRenderer::CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
} }
wxGraphicsBrush wxGraphicsBrush
wxCairoRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo, wxCairoRenderer::CreateRadialGradientBrush(wxDouble startX, wxDouble startX,
wxDouble xc, wxDouble yc, wxDouble r, wxDouble endX, wxDouble endY, wxDouble r,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix) const wxGraphicsMatrix& matrix)
{ {
wxGraphicsBrush p; wxGraphicsBrush p;
ENSURE_LOADED_OR_RETURN(p); ENSURE_LOADED_OR_RETURN(p);
wxCairoBrushData* d = new wxCairoBrushData( this ); wxCairoBrushData* d = new wxCairoBrushData( this );
d->CreateRadialGradientPattern(xo, yo, xc, yc, r, stops, matrix); d->CreateRadialGradientPattern(startX, startY, endX, endY, r, stops, matrix);
p.SetRefData(d); p.SetRefData(d);
return p; return p;
} }

22
src/msw/graphics.cpp
View File

@@ -269,8 +269,8 @@ public:
wxDouble x2, wxDouble y2, wxDouble x2, wxDouble y2,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix); const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix);
void CreateRadialGradientBrush(wxDouble xo, wxDouble yo, void CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix); const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix);
@@ -639,8 +639,8 @@ public :
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE;
virtual wxGraphicsBrush virtual wxGraphicsBrush
CreateRadialGradientBrush(wxDouble xo, wxDouble yo, CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE;
@@ -776,18 +776,18 @@ wxGDIPlusPenBrushBaseData::CreateLinearGradientBrush(
void void
wxGDIPlusPenBrushBaseData::CreateRadialGradientBrush( wxGDIPlusPenBrushBaseData::CreateRadialGradientBrush(
wxDouble xo, wxDouble yo, wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix) const wxGraphicsMatrix& matrix)
{ {
m_brushPath = new GraphicsPath(); m_brushPath = new GraphicsPath();
m_brushPath->AddEllipse( (REAL)(xc-radius), (REAL)(yc-radius), m_brushPath->AddEllipse( (REAL)(endX-radius), (REAL)(endY-radius),
(REAL)(2*radius), (REAL)(2*radius)); (REAL)(2*radius), (REAL)(2*radius));
PathGradientBrush * const brush = new PathGradientBrush(m_brushPath); PathGradientBrush * const brush = new PathGradientBrush(m_brushPath);
brush->SetCenterPoint(PointF(xo, yo)); brush->SetCenterPoint(PointF(startX, startY));
brush->SetCenterColor(wxColourToColor(stops.GetStartColour())); brush->SetCenterColor(wxColourToColor(stops.GetStartColour()));
const Color col(wxColourToColor(stops.GetEndColour())); const Color col(wxColourToColor(stops.GetEndColour()));
@@ -2701,8 +2701,8 @@ wxGDIPlusRenderer::CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
} }
wxGraphicsBrush wxGraphicsBrush
wxGDIPlusRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo, wxGDIPlusRenderer::CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix) const wxGraphicsMatrix& matrix)
@@ -2710,7 +2710,7 @@ wxGDIPlusRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush); ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush);
wxGraphicsBrush p; wxGraphicsBrush p;
wxGDIPlusBrushData* d = new wxGDIPlusBrushData( this ); wxGDIPlusBrushData* d = new wxGDIPlusBrushData( this );
d->CreateRadialGradientBrush(xo,yo,xc,yc,radius,stops,matrix); d->CreateRadialGradientBrush(startX,startY,endX,endY,radius,stops,matrix);
p.SetRefData(d); p.SetRefData(d);
return p; return p;
} }

20
src/msw/graphicsd2d.cpp
View File

@@ -2551,8 +2551,8 @@ public:
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix); const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix);
void CreateRadialGradientBrush(wxDouble xo, wxDouble yo, void CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix); const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix);
@@ -2608,14 +2608,14 @@ void wxD2DBrushData::CreateLinearGradientBrush(
} }
void wxD2DBrushData::CreateRadialGradientBrush( void wxD2DBrushData::CreateRadialGradientBrush(
wxDouble xo, wxDouble yo, wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix) const wxGraphicsMatrix& matrix)
{ {
m_brushResourceHolder = new wxD2DRadialGradientBrushResourceHolder( m_brushResourceHolder = new wxD2DRadialGradientBrushResourceHolder(
xo, yo, xc, yc, radius, stops, matrix); startX, startY, endX, endY, radius, stops, matrix);
} }
wxD2DBrushData* wxGetD2DBrushData(const wxGraphicsBrush& brush) wxD2DBrushData* wxGetD2DBrushData(const wxGraphicsBrush& brush)
@@ -4645,8 +4645,8 @@ public :
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE;
wxGraphicsBrush CreateRadialGradientBrush( wxGraphicsBrush CreateRadialGradientBrush(
wxDouble xo, wxDouble yo, wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE;
@@ -4847,14 +4847,14 @@ wxGraphicsBrush wxD2DRenderer::CreateLinearGradientBrush(
} }
wxGraphicsBrush wxD2DRenderer::CreateRadialGradientBrush( wxGraphicsBrush wxD2DRenderer::CreateRadialGradientBrush(
wxDouble xo, wxDouble yo, wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix) const wxGraphicsMatrix& matrix)
{ {
wxD2DBrushData* brushData = new wxD2DBrushData(this); wxD2DBrushData* brushData = new wxD2DBrushData(this);
brushData->CreateRadialGradientBrush(xo, yo, xc, yc, radius, stops, matrix); brushData->CreateRadialGradientBrush(startX, startY, endX, endY, radius, stops, matrix);
wxGraphicsBrush brush; wxGraphicsBrush brush;
brush.SetRefData(brushData); brush.SetRefData(brushData);

22
src/osx/carbon/graphics.cpp
View File

@@ -490,8 +490,8 @@ public:
wxDouble x2, wxDouble y2, wxDouble x2, wxDouble y2,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix); const wxGraphicsMatrix& matrix);
void CreateRadialGradientShading(wxDouble xo, wxDouble yo, void CreateRadialGradientShading(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble radius, wxDouble endX, wxDouble endY, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix); const wxGraphicsMatrix& matrix);
@@ -597,16 +597,16 @@ wxMacCoreGraphicsPenBrushDataBase::CreateLinearGradientShading(
void void
wxMacCoreGraphicsPenBrushDataBase::CreateRadialGradientShading( wxMacCoreGraphicsPenBrushDataBase::CreateRadialGradientShading(
wxDouble xo, wxDouble yo, wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix) const wxGraphicsMatrix& matrix)
{ {
m_gradientFunction = CreateGradientFunction(stops); m_gradientFunction = CreateGradientFunction(stops);
m_shading = CGShadingCreateRadial( wxMacGetGenericRGBColorSpace(), m_shading = CGShadingCreateRadial( wxMacGetGenericRGBColorSpace(),
CGPointMake((CGFloat) xo, (CGFloat) yo), 0, CGPointMake((CGFloat) startX, (CGFloat) startY), 0,
CGPointMake((CGFloat) xc, (CGFloat) yc), (CGFloat) radius, CGPointMake((CGFloat) endX, (CGFloat) endY), (CGFloat) radius,
m_gradientFunction, true, true ); m_gradientFunction, true, true );
m_isShading = true; m_isShading = true;
if (! matrix.IsNull() ) if (! matrix.IsNull() )
@@ -2766,8 +2766,8 @@ public :
const wxGraphicsMatrix& matrix) wxOVERRIDE; const wxGraphicsMatrix& matrix) wxOVERRIDE;
virtual wxGraphicsBrush virtual wxGraphicsBrush
CreateRadialGradientBrush(wxDouble xo, wxDouble yo, CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix) wxOVERRIDE; const wxGraphicsMatrix& matrix) wxOVERRIDE;
@@ -3032,15 +3032,15 @@ wxMacCoreGraphicsRenderer::CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
} }
wxGraphicsBrush wxGraphicsBrush
wxMacCoreGraphicsRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo, wxMacCoreGraphicsRenderer::CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix) const wxGraphicsMatrix& matrix)
{ {
wxGraphicsBrush p; wxGraphicsBrush p;
wxMacCoreGraphicsBrushData* d = new wxMacCoreGraphicsBrushData( this ); wxMacCoreGraphicsBrushData* d = new wxMacCoreGraphicsBrushData( this );
d->CreateRadialGradientShading(xo, yo, xc, yc, radius, stops, matrix); d->CreateRadialGradientShading(startX, startY, endX, endY, radius, stops, matrix);
p.SetRefData(d); p.SetRefData(d);
return p; return p;
} }

16
src/qt/graphics.cpp
View File

@@ -91,12 +91,12 @@ public:
m_brush = QBrush(gradient); m_brush = QBrush(gradient);
} }
void CreateRadialGradientBrush(wxDouble xo, wxDouble yo, void CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops) const wxGraphicsGradientStops& stops)
{ {
QRadialGradient gradient(QPointF(xc, yc), radius, QPointF(xo, yo)); QRadialGradient gradient(QPointF(endX, endY), radius, QPointF(startX, startY));
SetStops(gradient, stops); SetStops(gradient, stops);
m_brush = QBrush(gradient); m_brush = QBrush(gradient);
} }
@@ -1141,8 +1141,8 @@ public:
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE;
virtual wxGraphicsBrush virtual wxGraphicsBrush
CreateRadialGradientBrush(wxDouble xo, wxDouble yo, CreateRadialGradientBrush(wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble endX, wxDouble endY,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE; const wxGraphicsMatrix& matrix=wxNullGraphicsMatrix) wxOVERRIDE;
@@ -1287,14 +1287,14 @@ wxGraphicsBrush wxQtGraphicsRenderer::CreateLinearGradientBrush(
} }
wxGraphicsBrush wxQtGraphicsRenderer::CreateRadialGradientBrush( wxGraphicsBrush wxQtGraphicsRenderer::CreateRadialGradientBrush(
wxDouble xo, wxDouble yo, wxDouble startX, wxDouble startY,
wxDouble xc, wxDouble yc, wxDouble r, wxDouble endX, wxDouble endY, wxDouble r,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& WXUNUSED(matrix)) const wxGraphicsMatrix& WXUNUSED(matrix))
{ {
wxGraphicsBrush p; wxGraphicsBrush p;
wxQtBrushData* d = new wxQtBrushData(this); wxQtBrushData* d = new wxQtBrushData(this);
d->CreateRadialGradientBrush(xo, yo, xc, yc, r, stops); d->CreateRadialGradientBrush(startX, startY, endX, endY, r, stops);
p.SetRefData(d); p.SetRefData(d);
return p; return p;
} }