diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-25 13:59:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-26 08:30:18 +0200 |
| commit | 79aa1ab00a8361c44b8caf73294f841e6553eb72 (patch) | |
| tree | 4537bed05bb71b8302ac423ce898f585862bca4b /include/vcl/window.hxx | |
| parent | bb7ce3137dbe12d67f393b95a437b18e3a63f8e7 (diff) | |
convert VALIDATE constants to scoped enum
Change-Id: Ib3456116ab4c2e2f4b567bc195be2ad159b4fc82
Diffstat (limited to 'include/vcl/window.hxx')
| -rw-r--r-- | include/vcl/window.hxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 7c97bf977aa5..857f649ba15f 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -239,8 +239,16 @@ namespace o3tl } // Flags for Validate -#define VALIDATE_CHILDREN ((sal_uInt16)0x0001) -#define VALIDATE_NOCHILDREN ((sal_uInt16)0x0002) +enum class ValidateFlags +{ + NONE = 0x0000, + Children = 0x0001, + NoChildren = 0x0002 +}; +namespace o3tl +{ + template<> struct typed_flags<ValidateFlags> : is_typed_flags<ValidateFlags, 0x0003> {}; +} // Flags for Scroll #define SCROLL_CLIP ((sal_uInt16)0x0001) @@ -568,8 +576,8 @@ protected: SAL_DLLPRIVATE Point ImplOutputToFrame( const Point& rPos ); SAL_DLLPRIVATE void ImplInvalidateParentFrameRegion( vcl::Region& rRegion ); - SAL_DLLPRIVATE void ImplValidateFrameRegion( const vcl::Region* rRegion, sal_uInt16 nFlags ); - SAL_DLLPRIVATE void ImplValidate( const vcl::Region* rRegion, sal_uInt16 nFlags ); + SAL_DLLPRIVATE void ImplValidateFrameRegion( const vcl::Region* rRegion, ValidateFlags nFlags ); + SAL_DLLPRIVATE void ImplValidate( const vcl::Region* rRegion, ValidateFlags nFlags ); SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); @@ -1075,7 +1083,7 @@ public: virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ); virtual void Invalidate( const Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ); virtual void Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags = InvalidateFlags::NONE ); - void Validate( sal_uInt16 nFlags = 0 ); + void Validate( ValidateFlags nFlags = ValidateFlags::NONE ); bool HasPaintEvent() const; void Update(); void Flush(); |