diff options
| author | Noel Grandin <noel@peralex.com> | 2014-10-06 14:48:16 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-13 17:45:57 +0200 |
| commit | af5ebbf7835441c767f91a620f109ee6722e57bd (patch) | |
| tree | c72b2a1ddb5aa0a0a369be7babd516a5592d5fac /vcl/source/window/toolbox.cxx | |
| parent | 1156d11ef0bb2bc3d71ae9299656db4fed66f073 (diff) | |
create a macro library for implementing bit-flags types
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>,
changed from a macro- to a template-based solution. (Unfortunately MSVC 2012
does not support explicit conversion operators. Worked around that with
explicit #ifs rather than some HAVE_EXPLICIT_CONVERSION_OPERATORS and
SAL_EXPLICIT_CONVERSION_OPERATOR ainticipating we hopefully soon move to a
baseline that requires unconditional support for them.)
Change-Id: I4a89643b218d247e8e4a861faba458ec6dfe1396
Diffstat (limited to 'vcl/source/window/toolbox.cxx')
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index adcf55128543..816fac94d9e6 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -505,7 +505,7 @@ void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect ) if( pThis->IsInPaint() ) aPaintRegion.Intersect( pThis->GetActiveClipRegion() ); - pThis->Push( PUSH_CLIPREGION ); + pThis->Push( PushFlags::CLIPREGION ); pThis->IntersectClipRegion( aPaintRegion ); if( !pWrapper /*|| bIsInPopupMode*/ ) @@ -553,7 +553,7 @@ void ToolBox::ImplErase( ToolBox* pThis, const Rectangle &rRect, bool bHighlight { if( (((vcl::Window*) pThis)->GetStyle() & WB_3DLOOK ) ) { - pThis->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR ); + pThis->Push( PushFlags::LINECOLOR | PushFlags::FILLCOLOR ); pThis->SetLineColor(); if( bHasOpenPopup ) // choose the same color as the popup will use |