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/inc/window.h | |
| 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/inc/window.h')
| -rw-r--r-- | vcl/inc/window.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 983c3613cc66..53d077f200e8 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -118,7 +118,7 @@ struct ImplWinData struct ImplOverlapData { VirtualDevice* mpSaveBackDev; //< saved background bitmap - Region* mpSaveBackRgn; //< saved region, which must be invalidated + vcl::Region* mpSaveBackRgn; //< saved region, which must be invalidated vcl::Window* mpNextBackWin; //< next window with saved background sal_uIntPtr mnSaveBackSize; //< bitmap size of saved background bool mbSaveBack; //< true: save background @@ -259,11 +259,11 @@ public: ::std::vector< FixedText* > m_aMnemonicLabels; ImplAccessibleInfos* mpAccessibleInfos; VCLXWindow* mpVCLXWindow; - Region maWinRegion; //< region to 'shape' the VCL window (frame coordinates) - Region maWinClipRegion; //< the (clipping) region that finally corresponds to the VCL window (frame coordinates) - Region maInvalidateRegion; //< region that has to be redrawn (frame coordinates) - Region* mpChildClipRegion; //< child clip region if CLIPCHILDREN is set (frame coordinates) - Region* mpPaintRegion; //< only set during Paint() method call (window coordinates) + vcl::Region maWinRegion; //< region to 'shape' the VCL window (frame coordinates) + vcl::Region maWinClipRegion; //< the (clipping) region that finally corresponds to the VCL window (frame coordinates) + vcl::Region maInvalidateRegion; //< region that has to be redrawn (frame coordinates) + vcl::Region* mpChildClipRegion; //< child clip region if CLIPCHILDREN is set (frame coordinates) + vcl::Region* mpPaintRegion; //< only set during Paint() method call (window coordinates) WinBits mnStyle; WinBits mnPrevStyle; WinBits mnExtendedStyle; |