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

a few more int/wxPolygonFillMode substitutions in wxRegion and wxGraphicsContext code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-08 16:43:56 +00:00
parent ccf39540bb
commit 94a007ece4
17 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/graphics.h
View File

@@ -256,8 +256,8 @@ public:
virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)const; virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)const;
wxRect2DDouble GetBox()const; wxRect2DDouble GetBox()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;
bool Contains( const wxPoint2DDouble& c, int fillStyle = wxODDEVEN_RULE)const; bool Contains( const wxPoint2DDouble& c, wxPolygonFillMode fillStyle = wxODDEVEN_RULE)const;
const wxGraphicsPathData* GetPathData() const const wxGraphicsPathData* GetPathData() const
{ return (const wxGraphicsPathData*) GetRefData(); } { return (const wxGraphicsPathData*) GetRefData(); }
@@ -419,10 +419,10 @@ public:
virtual void StrokePath( const wxGraphicsPath& path ) = 0; virtual void StrokePath( const wxGraphicsPath& path ) = 0;
// fills a path with the current brush // 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 // 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 // text
@@ -474,7 +474,7 @@ public:
virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints); virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints);
// draws a polygon // 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 // draws a polygon
virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h); virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h);

2
include/wx/gtk1/region.h
View File

@@ -37,7 +37,7 @@ public:
InitRect(rect.x, rect.y, rect.width, rect.height); 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) wxRegion( const wxBitmap& bmp)
{ {

2
include/wx/mgl/region.h
View File

@@ -23,7 +23,7 @@ public:
wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
wxRegion(const wxRect& rect); wxRegion(const wxRect& rect);
wxRegion(const MGLRegion& region); 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) wxRegion(const wxBitmap& bmp)
{ {
Union(bmp); Union(bmp);

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

@@ -20,7 +20,7 @@ public:
wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
wxRegion(const wxRect& rect); wxRegion(const wxRect& rect);
wxRegion(WXHRGN hRegion); // Hangs on to this region 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 #if wxUSE_IMAGE
wxRegion( const wxBitmap& bmp) wxRegion( const wxBitmap& bmp)
{ {

2
include/wx/os2/region.h
View File

@@ -28,7 +28,7 @@ public:
); );
wxRegion(const wxRect& rRect); wxRegion(const wxRect& rRect);
wxRegion(WXHRGN hRegion, WXHDC hPS); // Hangs on to this region 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) wxRegion( const wxBitmap& bmp)
{ {
Union(bmp); Union(bmp);

2
include/wx/osx/carbon/region.h
View File

@@ -21,7 +21,7 @@ public:
wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
wxRegion(const wxRect& rect); wxRegion(const wxRect& rect);
wxRegion( WXHRGN hRegion ); 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();
wxRegion(const wxBitmap& bmp) wxRegion(const wxBitmap& bmp)
{ {

2
include/wx/palmos/region.h
View File

@@ -20,7 +20,7 @@ public:
wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
wxRegion(const wxRect& rect); wxRegion(const wxRect& rect);
wxRegion(WXHRGN hRegion); // Hangs on to this region 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 #if wxUSE_IMAGE
wxRegion( const wxBitmap& bmp) wxRegion( const wxBitmap& bmp)

2
include/wx/private/graphics.h
View File

@@ -149,7 +149,7 @@ public :
// gets the bounding box enclosing all points (possibly including control points) // 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 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 #endif

2
include/wx/region.h
View File

@@ -67,7 +67,7 @@ public:
wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h); wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
wxRegion(const wxRect& rect); 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);
wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0); wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0);
#endif // 0 #endif // 0

2
include/wx/x11/region.h
View File

@@ -39,7 +39,7 @@ public:
InitRect(rect.x, rect.y, rect.width, rect.height); 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) wxRegion( const wxBitmap& bmp)
{ {

8
src/common/graphcmn.cpp
View File

@@ -257,7 +257,7 @@ wxRect2DDouble wxGraphicsPath::GetBox() const
return wxRect2DDouble( x,y,w,h ); 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); 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); 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); return GetPathData()->Contains(x,y,fillStyle);
} }
@@ -607,7 +607,7 @@ void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
SetFont( wxNullGraphicsFont ); SetFont( wxNullGraphicsFont );
} }
void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, int fillStyle ) void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle )
{ {
FillPath( path , fillStyle ); FillPath( path , fillStyle );
StrokePath( path ); StrokePath( path );
@@ -722,7 +722,7 @@ void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *points)
StrokePath( path ); 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); wxASSERT(n > 1);
wxGraphicsPath path = CreatePath(); wxGraphicsPath path = CreatePath();

8
src/generic/graphicc.cpp
View File

@@ -165,7 +165,7 @@ public :
// gets the bounding box enclosing all points (possibly including control points) // gets the bounding box enclosing all points (possibly including control points)
virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const; 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 : private :
cairo_t* m_pathContext; cairo_t* m_pathContext;
@@ -348,7 +348,7 @@ public:
virtual bool SetLogicalFunction( wxRasterOperationMode function ); virtual bool SetLogicalFunction( wxRasterOperationMode function );
virtual void StrokePath( const wxGraphicsPath& p ); 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 Translate( wxDouble dx , wxDouble dy );
virtual void Scale( wxDouble xScale , wxDouble yScale ); 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; 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() ) if ( !m_brush.IsNull() )
{ {

2
src/gtk1/region.cpp
View File

@@ -107,7 +107,7 @@ wxRegion::wxRegion( GdkRegion *region )
M_REGIONDATA->m_region = gdk_regions_union(wxGdkRegion(), 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]; GdkPoint *gdkpoints = new GdkPoint[n];
for ( size_t i = 0 ; i < n ; i++ ) for ( size_t i = 0 ; i < n ; i++ )

12
src/msw/graphics.cpp
View File

@@ -145,7 +145,7 @@ public :
// gets the bounding box enclosing all points (possibly including control points) // gets the bounding box enclosing all points (possibly including control points)
virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const; 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 : private :
GraphicsPath* m_path; GraphicsPath* m_path;
@@ -296,13 +296,13 @@ public:
virtual void * GetNativeContext(); virtual void * GetNativeContext();
virtual void StrokePath( const wxGraphicsPath& p ); 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 // stroke lines connecting each of the points
virtual void StrokeLines( size_t n, const wxPoint2DDouble *points); virtual void StrokeLines( size_t n, const wxPoint2DDouble *points);
// draws a polygon // 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 Translate( wxDouble dx , wxDouble dy );
virtual void Scale( wxDouble xScale , wxDouble yScale ); virtual void Scale( wxDouble xScale , wxDouble yScale );
@@ -878,7 +878,7 @@ void wxGDIPlusPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *
*h = bounds.Height; *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); m_path->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);
return m_path->IsVisible( (FLOAT) x,(FLOAT) y) == TRUE ; 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() ); wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
Point *cpoints = new Point[n]; 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() ) if ( !m_brush.IsNull() )
{ {

2
src/msw/region.cpp
View File

@@ -119,7 +119,7 @@ wxRegion::wxRegion(const wxRect& rect)
M_REGION = ::CreateRectRgn(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height); 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__) #if defined(__WXMICROWIN__) || defined(__WXWINCE__)
wxUnusedVar(n); wxUnusedVar(n);

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

@@ -1145,7 +1145,7 @@ public :
// gets the bounding box enclosing all points (possibly including control points) // gets the bounding box enclosing all points (possibly including control points)
virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *y) const; 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 : private :
CGMutablePathRef m_path; CGMutablePathRef m_path;
}; };

2
src/palmos/region.cpp
View File

@@ -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)
{ {
} }