diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-27 14:52:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-30 09:58:23 +0200 |
commit | 8dbde0845a3989528614addb9bd0333f60c522a5 (patch) | |
tree | c1f13bfc8e2841427eb6a07e2147445b309b1e9a /vcl/win | |
parent | Use constants for ST_VerticalJc values (diff) | |
download | core-8dbde0845a3989528614addb9bd0333f60c522a5.tar.gz core-8dbde0845a3989528614addb9bd0333f60c522a5.zip |
fdo#82577: Handle Region
Put the VCL Region class in the vcl namespace. Avoids clash with the X11
Region typedef.
Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291
Diffstat (limited to 'vcl/win')
-rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 6 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi2.cxx | 2 | ||||
-rw-r--r-- | vcl/win/source/window/salobj.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 50c0f8efe83e..c518305547a2 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -780,7 +780,7 @@ void WinSalGraphics::ResetClipRegion() SelectClipRgn( getHDC(), 0 ); } -bool WinSalGraphics::setClipRegion( const Region& i_rClip ) +bool WinSalGraphics::setClipRegion( const vcl::Region& i_rClip ) { if ( mhRegion ) { @@ -793,14 +793,14 @@ bool WinSalGraphics::setClipRegion( const Region& i_rClip ) // #i122149# try to avoid usage of PolyPolygon ClipRegions when PolyPolygon is no curve // and only contains horizontal/vertical edges. In that case, use the fallback - // in GetRegionRectangles which will use Region::GetAsRegionBand() which will do + // in GetRegionRectangles which will use vcl::Region::GetAsRegionBand() which will do // the correct polygon-to-RegionBand transformation. // Background is that when using the same Rectangle as rectangle or as Polygon // clip region will lead to different results; the polygon-based one will be // one pixel less to the right and down (see GDI docu for CreatePolygonRgn). This // again is because of the polygon-nature and it's classic handling when filling. // This also means that all cases which use a 'true' polygon-based incarnation of - // a Region should know what they do - it may lead to repaint errors. + // a vcl::Region should know what they do - it may lead to repaint errors. if(bUsePolygon && bTryToAvoidPolygon) { const basegfx::B2DPolyPolygon aPolyPolygon( i_rClip.GetAsB2DPolyPolygon() ); diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index 720a61c35bc7..16f262fa41c6 100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -301,7 +301,7 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY, // invalidate regions that were not copied bool bInvalidate = true; - // Combine Invalidate Region with existing ClipRegion + // Combine Invalidate vcl::Region with existing ClipRegion HRGN hTempRgn = CreateRectRgn( 0, 0, 0, 0 ); if ( GetClipRgn( getHDC(), hTempRgn ) == 1 ) { diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index 2ab837c9d5d9..98862e69fb56 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -656,7 +656,7 @@ void WinSalObject::EndSetClipRegion() { HRGN hRegion; - // create a ClipRegion from the Region data + // create a ClipRegion from the vcl::Region data if ( mpClipRgnData->rdh.nCount == 1 ) { RECT* pRect = &(mpClipRgnData->rdh.rcBound); |