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

build fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-08 19:26:10 +00:00
parent 9690b00654
commit 33ef0bdb1f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1256,7 +1256,7 @@ void wxMacCoreGraphicsPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wx
*h = bounds.size.height; *h = bounds.size.height;
} }
bool wxMacCoreGraphicsPathData::Contains( wxDouble x, wxDouble y, int fillStyle) const bool wxMacCoreGraphicsPathData::Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle) const
{ {
return CGPathContainsPoint( m_path, NULL, CGPointMake((CGFloat) x,(CGFloat) y), fillStyle == wxODDEVEN_RULE ); return CGPathContainsPoint( m_path, NULL, CGPointMake((CGFloat) x,(CGFloat) y), fillStyle == wxODDEVEN_RULE );
} }
@@ -1344,10 +1344,10 @@ public:
virtual void StrokePath( const wxGraphicsPath &path ); virtual void StrokePath( const wxGraphicsPath &path );
// fills a path with the current brush // fills a path with the current brush
virtual void FillPath( const wxGraphicsPath &path, int fillStyle = wxODDEVEN_RULE ); virtual void FillPath( const wxGraphicsPath &path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
// 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 );
virtual bool ShouldOffset() const virtual bool ShouldOffset() const
{ {
@@ -1732,7 +1732,7 @@ void wxMacCoreGraphicsContext::StrokePath( const wxGraphicsPath &path )
CGContextStrokePath( m_cgContext ); CGContextStrokePath( m_cgContext );
} }
void wxMacCoreGraphicsContext::DrawPath( const wxGraphicsPath &path , int fillStyle ) void wxMacCoreGraphicsContext::DrawPath( const wxGraphicsPath &path , wxPolygonFillMode fillStyle )
{ {
if ( !m_brush.IsNull() && ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() ) if ( !m_brush.IsNull() && ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() )
{ {
@@ -1781,7 +1781,7 @@ void wxMacCoreGraphicsContext::DrawPath( const wxGraphicsPath &path , int fillSt
CGContextDrawPath( m_cgContext , mode ); CGContextDrawPath( m_cgContext , mode );
} }
void wxMacCoreGraphicsContext::FillPath( const wxGraphicsPath &path , int fillStyle ) void wxMacCoreGraphicsContext::FillPath( const wxGraphicsPath &path , wxPolygonFillMode fillStyle )
{ {
if ( m_brush.IsNull() ) if ( m_brush.IsNull() )
return; return;