diff options
author | Noel Grandin <noel@peralex.com> | 2015-05-27 16:09:43 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-05-28 12:47:08 +0200 |
commit | f3331f7694e74f349375c223ce7ed84838e92d89 (patch) | |
tree | ef238fa98153c756df201d26d15e0602638298cc /vcl/source/control | |
parent | 173aa749d50f904887e4aa1ce425c6807668bff0 (diff) |
convert PARENTCLIPMODE constants to scoped enum
Change-Id: I36a53112e75fca9208b2f91e224a7c671695509b
Diffstat (limited to 'vcl/source/control')
-rw-r--r-- | vcl/source/control/button.cxx | 14 | ||||
-rw-r--r-- | vcl/source/control/fixed.cxx | 16 | ||||
-rw-r--r-- | vcl/source/control/group.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/prgsbar.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/slider.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/tabctrl.cxx | 4 |
6 files changed, 22 insertions, 22 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index b13ac6fd669f..35c0262db9f1 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -691,13 +691,13 @@ void PushButton::ImplInitSettings( bool bFont, { SetBackground(); // #i38498#: do not check for GetParent()->IsChildTransparentModeEnabled() - // otherwise the formcontrol button will be overdrawn due to PARENTCLIPMODE_NOCLIP + // otherwise the formcontrol button will be overdrawn due to ParentClipMode::NoClip // for radio and checkbox this is ok as they should appear transparent in documents if ( IsNativeControlSupported( CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL ) || (GetStyle() & WB_FLATBUTTON) != 0 ) { EnableChildTransparentMode( true ); - SetParentClipMode( PARENTCLIPMODE_NOCLIP ); + SetParentClipMode( ParentClipMode::NoClip ); SetPaintTransparent( true ); mpWindowImpl->mbUseNativeFocus = (GetStyle() & WB_FLATBUTTON) == 0 && ImplGetSVData()->maNWFData.mbNoFocusRects; @@ -705,7 +705,7 @@ void PushButton::ImplInitSettings( bool bFont, else { EnableChildTransparentMode( false ); - SetParentClipMode( 0 ); + SetParentClipMode( ParentClipMode::NONE ); SetPaintTransparent( false ); } } @@ -1855,7 +1855,7 @@ void RadioButton::ImplInitSettings( bool bFont, (pParent->IsChildTransparentModeEnabled() || IsNativeControlSupported( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL ) ) ) { EnableChildTransparentMode( true ); - SetParentClipMode( PARENTCLIPMODE_NOCLIP ); + SetParentClipMode( ParentClipMode::NoClip ); SetPaintTransparent( true ); SetBackground(); if( IsNativeControlSupported( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL ) ) @@ -1864,7 +1864,7 @@ void RadioButton::ImplInitSettings( bool bFont, else { EnableChildTransparentMode( false ); - SetParentClipMode( 0 ); + SetParentClipMode( ParentClipMode::NONE ); SetPaintTransparent( false ); if ( IsControlBackground() ) @@ -2993,7 +2993,7 @@ void CheckBox::ImplInitSettings( bool bFont, (pParent->IsChildTransparentModeEnabled() || IsNativeControlSupported( CTRL_CHECKBOX, PART_ENTIRE_CONTROL ) ) ) { EnableChildTransparentMode( true ); - SetParentClipMode( PARENTCLIPMODE_NOCLIP ); + SetParentClipMode( ParentClipMode::NoClip ); SetPaintTransparent( true ); SetBackground(); if( IsNativeControlSupported( CTRL_CHECKBOX, PART_ENTIRE_CONTROL ) ) @@ -3002,7 +3002,7 @@ void CheckBox::ImplInitSettings( bool bFont, else { EnableChildTransparentMode( false ); - SetParentClipMode( 0 ); + SetParentClipMode( ParentClipMode::NONE ); SetPaintTransparent( false ); if ( IsControlBackground() ) diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index c891061be18c..214db260083e 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -211,14 +211,14 @@ void FixedText::ApplySettings(vcl::RenderContext& rRenderContext) if (pParent->IsChildTransparentModeEnabled() && !IsControlBackground()) { EnableChildTransparentMode(true); - SetParentClipMode(PARENTCLIPMODE_NOCLIP); + SetParentClipMode(ParentClipMode::NoClip); SetPaintTransparent(true); rRenderContext.SetBackground(); } else { EnableChildTransparentMode(false); - SetParentClipMode(0); + SetParentClipMode(ParentClipMode::NONE); SetPaintTransparent(false); if (IsControlBackground()) @@ -619,14 +619,14 @@ void FixedLine::ApplySettings(vcl::RenderContext& rRenderContext) if (pParent->IsChildTransparentModeEnabled() && !IsControlBackground()) { EnableChildTransparentMode(true); - SetParentClipMode(PARENTCLIPMODE_NOCLIP); + SetParentClipMode(ParentClipMode::NoClip); SetPaintTransparent(true); rRenderContext.SetBackground(); } else { EnableChildTransparentMode(false); - SetParentClipMode(0); + SetParentClipMode(ParentClipMode::NONE); SetPaintTransparent(false); if (IsControlBackground()) @@ -751,14 +751,14 @@ void FixedBitmap::ApplySettings(vcl::RenderContext& rRenderContext) if (pParent->IsChildTransparentModeEnabled() && !IsControlBackground()) { EnableChildTransparentMode(true); - SetParentClipMode(PARENTCLIPMODE_NOCLIP); + SetParentClipMode(ParentClipMode::NoClip); SetPaintTransparent(true); rRenderContext.SetBackground(); } else { EnableChildTransparentMode(false); - SetParentClipMode(0); + SetParentClipMode(ParentClipMode::NONE); SetPaintTransparent(false); if (IsControlBackground()) @@ -921,14 +921,14 @@ void FixedImage::ApplySettings(vcl::RenderContext& rRenderContext) if (pParent && pParent->IsChildTransparentModeEnabled() && !IsControlBackground()) { EnableChildTransparentMode(true); - SetParentClipMode(PARENTCLIPMODE_NOCLIP); + SetParentClipMode(ParentClipMode::NoClip); SetPaintTransparent(true); rRenderContext.SetBackground(); } else { EnableChildTransparentMode(false); - SetParentClipMode(0); + SetParentClipMode(ParentClipMode::NONE); SetPaintTransparent(false); if (IsControlBackground()) diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 69dcca532f4e..1c2ca0ca57f7 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -68,14 +68,14 @@ void GroupBox::ImplInitSettings( bool bFont, !IsControlBackground() ) { EnableChildTransparentMode( true ); - SetParentClipMode( PARENTCLIPMODE_NOCLIP ); + SetParentClipMode( ParentClipMode::NoClip ); SetPaintTransparent( true ); SetBackground(); } else { EnableChildTransparentMode( false ); - SetParentClipMode( 0 ); + SetParentClipMode( ParentClipMode::NONE ); SetPaintTransparent( false ); if ( IsControlBackground() ) diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index b9e8cb932a12..723a5e87ad20 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -83,7 +83,7 @@ void ProgressBar::ImplInitSettings( bool bFont, EnableChildTransparentMode( true ); SetPaintTransparent( true ); SetBackground(); - SetParentClipMode( PARENTCLIPMODE_NOCLIP ); + SetParentClipMode( ParentClipMode::NoClip ); } else { diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index db264ee6b703..4feabab84e7e 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -99,14 +99,14 @@ void Slider::ImplInitSettings() if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); - SetParentClipMode( PARENTCLIPMODE_NOCLIP ); + SetParentClipMode( ParentClipMode::NoClip ); SetPaintTransparent( true ); SetBackground(); } else { EnableChildTransparentMode( false ); - SetParentClipMode( 0 ); + SetParentClipMode( ParentClipMode::NONE ); SetPaintTransparent( false ); if ( IsControlBackground() ) diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 76b9e391e6a4..3216d90d549d 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -145,7 +145,7 @@ void TabControl::ImplInitSettings( bool bFont, // set transparent mode for NWF tabcontrols to have // the background always cleared properly EnableChildTransparentMode( true ); - SetParentClipMode( PARENTCLIPMODE_NOCLIP ); + SetParentClipMode( ParentClipMode::NoClip ); SetPaintTransparent( true ); SetBackground(); ImplGetWindowImpl()->mbUseNativeFocus = ImplGetSVData()->maNWFData.mbNoFocusRects; @@ -153,7 +153,7 @@ void TabControl::ImplInitSettings( bool bFont, else { EnableChildTransparentMode( false ); - SetParentClipMode( 0 ); + SetParentClipMode( ParentClipMode::NONE ); SetPaintTransparent( false ); if ( IsControlBackground() ) |