diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-18 15:41:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-20 09:52:08 +0200 |
| commit | dcefc97c8bd5be9ba229098c32d2a5c73d084163 (patch) | |
| tree | 860caac40b5c15ddb3cd1297316975d7034b260e /vcl/source/window | |
| parent | 953f327818f565969b8de5d9b956bd6b9a7c64b2 (diff) | |
convert IMAGE_DRAW_ constants to scoped enum
Change-Id: I75619eeb902af4953a5ac1525605cf3f0f15e2c0
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/menu.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 9cefd27c8f7d..9d1dee066889 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1863,7 +1863,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, nTextOffsetY += (aOutSz.Height()-pData->aSz.Height()) / 2; DrawTextFlags nTextStyle = DrawTextFlags::NONE; DrawSymbolFlags nSymbolStyle = DrawSymbolFlags::NONE; - sal_uInt16 nImageStyle = 0; + DrawImageFlags nImageStyle = DrawImageFlags::NONE; // submenus without items are not disabled when no items are // contained. The application itself should check for this! @@ -1873,7 +1873,7 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext, { nTextStyle |= DrawTextFlags::Disable; nSymbolStyle |= DrawSymbolFlags::Disable; - nImageStyle |= IMAGE_DRAW_DISABLE; + nImageStyle |= DrawImageFlags::Disable; } // Separator diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 438a405290cc..76051f8eabbc 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -3164,10 +3164,10 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, aImageSize = pImage->GetSizePixel(); // determine drawing flags - sal_uInt16 nImageStyle = 0; + DrawImageFlags nImageStyle = DrawImageFlags::NONE; if ( !pItem->mbEnabled || !IsEnabled() ) - nImageStyle |= IMAGE_DRAW_DISABLE; + nImageStyle |= DrawImageFlags::Disable; // #i35563# the dontknow state indicates different states at the same time // which should not be rendered disabled but normal @@ -3198,7 +3198,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, if( nHighlight != 0 ) { if( bHighContrastWhite ) - nImageStyle |= IMAGE_DRAW_COLORTRANSFORM; + nImageStyle |= DrawImageFlags::ColorTransform; } } rRenderContext.DrawImage(Point( nImageOffX, nImageOffY ), *pImage, nImageStyle); |