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/source/window/stacking.cxx | |
parent | b69478acff4f5b7a9d334a765a1a528d44d7b3a4 (diff) |
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/source/window/stacking.cxx')
-rw-r--r-- | vcl/source/window/stacking.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index d9fb863adfcc..ad533cf31601 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -48,7 +48,7 @@ struct ImplCalcToTopData { ImplCalcToTopData* mpNext; vcl::Window* mpWindow; - Region* mpInvalidateRegion; + vcl::Region* mpInvalidateRegion; }; namespace vcl { @@ -219,9 +219,9 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) { // calculate region, where the window overlaps with other windows Point aPoint( mnOutOffX, mnOutOffY ); - Region aRegion( Rectangle( aPoint, + vcl::Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); - Region aInvalidateRegion; + vcl::Region aInvalidateRegion; ImplCalcOverlapRegionOverlaps( aRegion, aInvalidateRegion ); if ( !aInvalidateRegion.IsEmpty() ) @@ -230,7 +230,7 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) pPrevData->mpNext = pData; pData->mpNext = NULL; pData->mpWindow = this; - pData->mpInvalidateRegion = new Region( aInvalidateRegion ); + pData->mpInvalidateRegion = new vcl::Region( aInvalidateRegion ); } } } |