From 94a007ece4bcd6231d31bcb91516463b7f981a0e Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Thu, 8 Jan 2009 16:43:56 +0000 Subject: [PATCH] a few more int/wxPolygonFillMode substitutions in wxRegion and wxGraphicsContext code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/graphics.h | 10 +++++----- include/wx/gtk1/region.h | 2 +- include/wx/mgl/region.h | 2 +- include/wx/msw/region.h | 2 +- include/wx/os2/region.h | 2 +- include/wx/osx/carbon/region.h | 2 +- include/wx/palmos/region.h | 2 +- include/wx/private/graphics.h | 20 ++++++++++---------- include/wx/region.h | 2 +- include/wx/x11/region.h | 2 +- src/common/graphcmn.cpp | 8 ++++---- src/generic/graphicc.cpp | 8 ++++---- src/gtk1/region.cpp | 2 +- src/msw/graphics.cpp | 12 ++++++------ src/msw/region.cpp | 2 +- src/osx/carbon/graphics.cpp | 2 +- src/palmos/region.cpp | 2 +- 17 files changed, 41 insertions(+), 41 deletions(-) diff --git a/include/wx/graphics.h b/include/wx/graphics.h index eb27c4d601..14c007ec28 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -256,8 +256,8 @@ public: virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)const; wxRect2DDouble GetBox()const; - virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE)const; - bool Contains( const wxPoint2DDouble& c, int fillStyle = wxODDEVEN_RULE)const; + virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE)const; + bool Contains( const wxPoint2DDouble& c, wxPolygonFillMode fillStyle = wxODDEVEN_RULE)const; const wxGraphicsPathData* GetPathData() const { return (const wxGraphicsPathData*) GetRefData(); } @@ -419,10 +419,10 @@ public: virtual void StrokePath( const wxGraphicsPath& path ) = 0; // fills a path with the current brush - virtual void FillPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE ) = 0; + virtual void FillPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) = 0; // draws a path by first filling and then stroking - virtual void DrawPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE ); + virtual void DrawPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); // // text @@ -474,7 +474,7 @@ public: virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints); // draws a polygon - virtual void DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle = wxODDEVEN_RULE ); + virtual void DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); // draws a polygon virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h); diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h index 6704c3e4c8..6cb110f73c 100644 --- a/include/wx/gtk1/region.h +++ b/include/wx/gtk1/region.h @@ -37,7 +37,7 @@ public: InitRect(rect.x, rect.y, rect.width, rect.height); } - wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + wxRegion( size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); wxRegion( const wxBitmap& bmp) { diff --git a/include/wx/mgl/region.h b/include/wx/mgl/region.h index 472f33ebf5..052f33b40b 100644 --- a/include/wx/mgl/region.h +++ b/include/wx/mgl/region.h @@ -23,7 +23,7 @@ public: wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); wxRegion(const MGLRegion& region); - wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); wxRegion(const wxBitmap& bmp) { Union(bmp); diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h index b75113bbd9..b2ead3ca9c 100644 --- a/include/wx/msw/region.h +++ b/include/wx/msw/region.h @@ -20,7 +20,7 @@ public: wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); wxRegion(WXHRGN hRegion); // Hangs on to this region - wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); #if wxUSE_IMAGE wxRegion( const wxBitmap& bmp) { diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h index ef4e1a12ea..a5c06bbac5 100644 --- a/include/wx/os2/region.h +++ b/include/wx/os2/region.h @@ -28,7 +28,7 @@ public: ); wxRegion(const wxRect& rRect); wxRegion(WXHRGN hRegion, WXHDC hPS); // Hangs on to this region - wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); wxRegion( const wxBitmap& bmp) { Union(bmp); diff --git a/include/wx/osx/carbon/region.h b/include/wx/osx/carbon/region.h index 480109a8ee..1cf5bbef0f 100644 --- a/include/wx/osx/carbon/region.h +++ b/include/wx/osx/carbon/region.h @@ -21,7 +21,7 @@ public: wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); wxRegion( WXHRGN hRegion ); - wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); wxRegion(); wxRegion(const wxBitmap& bmp) { diff --git a/include/wx/palmos/region.h b/include/wx/palmos/region.h index 9ca01e8071..86459caf46 100644 --- a/include/wx/palmos/region.h +++ b/include/wx/palmos/region.h @@ -20,7 +20,7 @@ public: wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); wxRegion(WXHRGN hRegion); // Hangs on to this region - wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); #if wxUSE_IMAGE wxRegion( const wxBitmap& bmp) diff --git a/include/wx/private/graphics.h b/include/wx/private/graphics.h index 2fac1b0733..b40a02493f 100644 --- a/include/wx/private/graphics.h +++ b/include/wx/private/graphics.h @@ -15,7 +15,7 @@ #if wxUSE_GRAPHICS_CONTEXT #include "wx/graphics.h" - + class WXDLLIMPEXP_CORE wxGraphicsObjectRefData : public wxObjectRefData { public : @@ -23,7 +23,7 @@ class WXDLLIMPEXP_CORE wxGraphicsObjectRefData : public wxObjectRefData wxGraphicsObjectRefData( const wxGraphicsObjectRefData* data ); wxGraphicsRenderer* GetRenderer() const ; virtual wxGraphicsObjectRefData* Clone() const ; - + protected : wxGraphicsRenderer* m_renderer; } ; @@ -31,7 +31,7 @@ class WXDLLIMPEXP_CORE wxGraphicsObjectRefData : public wxObjectRefData class WXDLLIMPEXP_CORE wxGraphicsMatrixData : public wxGraphicsObjectRefData { public : - wxGraphicsMatrixData( wxGraphicsRenderer* renderer) : + wxGraphicsMatrixData( wxGraphicsRenderer* renderer) : wxGraphicsObjectRefData(renderer) {} virtual ~wxGraphicsMatrixData() {} @@ -40,13 +40,13 @@ public : virtual void Concat( const wxGraphicsMatrixData *t ) = 0; // sets the matrix to the respective values - virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, + virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, wxDouble tx=0.0, wxDouble ty=0.0) = 0; // gets the component valuess of the matrix virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL, wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const = 0; - + // makes this the inverse matrix virtual void Invert() = 0; @@ -67,7 +67,7 @@ public : virtual void Scale( wxDouble xScale , wxDouble yScale ) = 0; // add the rotation to this matrix (radians) - virtual void Rotate( wxDouble angle ) = 0; + virtual void Rotate( wxDouble angle ) = 0; // // apply the transforms @@ -96,7 +96,7 @@ public : // begins a new subpath at (x,y) virtual void MoveToPoint( wxDouble x, wxDouble y ) = 0; - // adds a straight line from the current point to (x,y) + // adds a straight line from the current point to (x,y) virtual void AddLineToPoint( wxDouble x, wxDouble y ) = 0; // adds a cubic Bezier curve from the current point, using two control points and an end point @@ -115,14 +115,14 @@ public : virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) = 0; // - // These are convenience functions which - if not available natively will be assembled + // These are convenience functions which - if not available natively will be assembled // using the primitives from above // // adds a quadratic Bezier curve from the current point, using a control point and an end point virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y ); - // appends a rectangle as a new closed subpath + // appends a rectangle as a new closed subpath virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); // appends an ellipsis as a new closed subpath fitting the passed rectangle @@ -149,7 +149,7 @@ public : // gets the bounding box enclosing all points (possibly including control points) virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const=0; - virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const=0; + virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const=0; }; #endif diff --git a/include/wx/region.h b/include/wx/region.h index 38c61ccf9c..103306be89 100644 --- a/include/wx/region.h +++ b/include/wx/region.h @@ -67,7 +67,7 @@ public: wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h); wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); - wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE); + wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE); wxRegion(const wxBitmap& bmp); wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0); #endif // 0 diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h index 1ba0e898a1..276bf54eea 100644 --- a/include/wx/x11/region.h +++ b/include/wx/x11/region.h @@ -39,7 +39,7 @@ public: InitRect(rect.x, rect.y, rect.width, rect.height); } - wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + wxRegion( size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); wxRegion( const wxBitmap& bmp) { diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp index 590e4a0586..f2396a06b1 100644 --- a/src/common/graphcmn.cpp +++ b/src/common/graphcmn.cpp @@ -257,7 +257,7 @@ wxRect2DDouble wxGraphicsPath::GetBox() const return wxRect2DDouble( x,y,w,h ); } -bool wxGraphicsPath::Contains( const wxPoint2DDouble& c, int fillStyle ) const +bool wxGraphicsPath::Contains( const wxPoint2DDouble& c, wxPolygonFillMode fillStyle ) const { return Contains( c.m_x, c.m_y, fillStyle); } @@ -383,7 +383,7 @@ void wxGraphicsPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) GetPathData()->GetBox(x,y,w,h); } -bool wxGraphicsPath::Contains( wxDouble x, wxDouble y, int fillStyle ) const +bool wxGraphicsPath::Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle ) const { return GetPathData()->Contains(x,y,fillStyle); } @@ -607,7 +607,7 @@ void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour ) SetFont( wxNullGraphicsFont ); } -void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, int fillStyle ) +void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle ) { FillPath( path , fillStyle ); StrokePath( path ); @@ -722,7 +722,7 @@ void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *points) StrokePath( path ); } -void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle) +void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle) { wxASSERT(n > 1); wxGraphicsPath path = CreatePath(); diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index 92843942d5..a7b59e5e5a 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -165,7 +165,7 @@ public : // gets the bounding box enclosing all points (possibly including control points) virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const; - virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxWINDING_RULE) const; + virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxWINDING_RULE) const; private : cairo_t* m_pathContext; @@ -348,7 +348,7 @@ public: virtual bool SetLogicalFunction( wxRasterOperationMode function ); virtual void StrokePath( const wxGraphicsPath& p ); - virtual void FillPath( const wxGraphicsPath& p , int fillStyle = wxWINDING_RULE ); + virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxWINDING_RULE ); virtual void Translate( wxDouble dx , wxDouble dy ); virtual void Scale( wxDouble xScale , wxDouble yScale ); @@ -879,7 +879,7 @@ void wxCairoPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) } } -bool wxCairoPathData::Contains( wxDouble x, wxDouble y, int WXUNUSED(fillStyle) ) const +bool wxCairoPathData::Contains( wxDouble x, wxDouble y, wxPolygonFillMode WXUNUSED(fillStyle) ) const { return cairo_in_stroke( m_pathContext, x, y) != 0; } @@ -1223,7 +1223,7 @@ void wxCairoContext::StrokePath( const wxGraphicsPath& path ) } } -void wxCairoContext::FillPath( const wxGraphicsPath& path , int fillStyle ) +void wxCairoContext::FillPath( const wxGraphicsPath& path , wxPolygonFillMode fillStyle ) { if ( !m_brush.IsNull() ) { diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index ea44a6498f..de01c37e53 100644 --- a/src/gtk1/region.cpp +++ b/src/gtk1/region.cpp @@ -107,7 +107,7 @@ wxRegion::wxRegion( GdkRegion *region ) M_REGIONDATA->m_region = gdk_regions_union(wxGdkRegion(), region); } -wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle ) +wxRegion::wxRegion( size_t n, const wxPoint *points, wxPolygonFillMode fillStyle ) { GdkPoint *gdkpoints = new GdkPoint[n]; for ( size_t i = 0 ; i < n ; i++ ) diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index 210f3e0f9f..e1173d1d95 100644 --- a/src/msw/graphics.cpp +++ b/src/msw/graphics.cpp @@ -145,7 +145,7 @@ public : // gets the bounding box enclosing all points (possibly including control points) virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const; - virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const; + virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const; private : GraphicsPath* m_path; @@ -296,13 +296,13 @@ public: virtual void * GetNativeContext(); virtual void StrokePath( const wxGraphicsPath& p ); - virtual void FillPath( const wxGraphicsPath& p , int fillStyle = wxODDEVEN_RULE ); + virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); // stroke lines connecting each of the points virtual void StrokeLines( size_t n, const wxPoint2DDouble *points); // draws a polygon - virtual void DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle = wxODDEVEN_RULE ); + virtual void DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); virtual void Translate( wxDouble dx , wxDouble dy ); virtual void Scale( wxDouble xScale , wxDouble yScale ); @@ -878,7 +878,7 @@ void wxGDIPlusPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble * *h = bounds.Height; } -bool wxGDIPlusPathData::Contains( wxDouble x, wxDouble y, int fillStyle ) const +bool wxGDIPlusPathData::Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle ) const { m_path->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding); return m_path->IsVisible( (FLOAT) x,(FLOAT) y) == TRUE ; @@ -1125,7 +1125,7 @@ void wxGDIPlusContext::StrokeLines( size_t n, const wxPoint2DDouble *points) } } -void wxGDIPlusContext::DrawLines( size_t n, const wxPoint2DDouble *points, int WXUNUSED(fillStyle) ) +void wxGDIPlusContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode WXUNUSED(fillStyle) ) { wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() ); Point *cpoints = new Point[n]; @@ -1151,7 +1151,7 @@ void wxGDIPlusContext::StrokePath( const wxGraphicsPath& path ) } } -void wxGDIPlusContext::FillPath( const wxGraphicsPath& path , int fillStyle ) +void wxGDIPlusContext::FillPath( const wxGraphicsPath& path , wxPolygonFillMode fillStyle ) { if ( !m_brush.IsNull() ) { diff --git a/src/msw/region.cpp b/src/msw/region.cpp index 329f150d01..3be6d5496c 100644 --- a/src/msw/region.cpp +++ b/src/msw/region.cpp @@ -119,7 +119,7 @@ wxRegion::wxRegion(const wxRect& rect) M_REGION = ::CreateRectRgn(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height); } -wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle) +wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle) { #if defined(__WXMICROWIN__) || defined(__WXWINCE__) wxUnusedVar(n); diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index b018e6a38c..f29097f36e 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -1145,7 +1145,7 @@ public : // gets the bounding box enclosing all points (possibly including control points) virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *y) const; - virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const; + virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const; private : CGMutablePathRef m_path; }; diff --git a/src/palmos/region.cpp b/src/palmos/region.cpp index ae6ffff148..4ac54e0165 100644 --- a/src/palmos/region.cpp +++ b/src/palmos/region.cpp @@ -65,7 +65,7 @@ wxRegion::wxRegion(const wxRect& rect) { } -wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle) +wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle) { } -- 2.47.2