diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-27 16:24:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-31 09:09:13 +0000 |
| commit | 5c977a9ddff3c221c098a57855ede7c0ef4fe31f (patch) | |
| tree | 4f2904d4b9bce00344ddce0d17ed7d6dc63e6fcf /vcl/source/window/dockingarea.cxx | |
| parent | 526ed1f7dbd9150734edcb03727d49e1b1306f56 (diff) | |
Convert ControlType to scoped enum
Change-Id: Iaa13c3e7030296a97bab144103745867d43b4b19
Reviewed-on: https://gerrit.libreoffice.org/25554
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/window/dockingarea.cxx')
| -rw-r--r-- | vcl/source/window/dockingarea.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index 6ea846de11f3..d2993e1e38e4 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -79,8 +79,8 @@ static void ImplInvalidateMenubar( DockingAreaWindow* pThis ) // the menubar must be repainted if the top dockingarea changes size or visibility if( ImplGetSVData()->maNWFData.mbMenuBarDockingAreaCommonBG && (pThis->GetAlign() == WindowAlign::Top) - && pThis->IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) - && pThis->IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL ) ) + && pThis->IsNativeControlSupported( ControlType::Toolbar, PART_ENTIRE_CONTROL ) + && pThis->IsNativeControlSupported( ControlType::Menubar, PART_ENTIRE_CONTROL ) ) { SystemWindow *pSysWin = pThis->GetSystemWindow(); if( pSysWin && pSysWin->GetMenuBar() ) @@ -149,7 +149,7 @@ void DockingAreaWindow::ApplySettings(vcl::RenderContext& rRenderContext) rRenderContext.SetBackground(aWallpaper); } - else if (rRenderContext.IsNativeControlSupported(CTRL_TOOLBAR, PART_ENTIRE_CONTROL)) + else if (rRenderContext.IsNativeControlSupported(ControlType::Toolbar, PART_ENTIRE_CONTROL)) { Wallpaper aWallpaper; aWallpaper.SetStyle(WallpaperStyle::ApplicationGradient); @@ -165,7 +165,7 @@ void DockingAreaWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangl const StyleSettings rSetting = rRenderContext.GetSettings().GetStyleSettings(); EnableNativeWidget(); // only required because the toolkit currently switches this flag off - if (rRenderContext.IsNativeControlSupported(CTRL_TOOLBAR, PART_ENTIRE_CONTROL)) + if (rRenderContext.IsNativeControlSupported(ControlType::Toolbar, PART_ENTIRE_CONTROL)) { ToolbarValue aControlValue; @@ -186,7 +186,7 @@ void DockingAreaWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangl // draw a single toolbar background covering the whole docking area Rectangle aCtrlRegion(Point(), GetOutputSizePixel()); - rRenderContext.DrawNativeControl(CTRL_TOOLBAR, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT, + rRenderContext.DrawNativeControl(ControlType::Toolbar, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT, aCtrlRegion, nState, aControlValue, OUString() ); if (!ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames) @@ -249,7 +249,7 @@ void DockingAreaWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangl aTBRect.Top() = 0; aTBRect.Bottom() = aOutSz.Height() - 1; } - rRenderContext.DrawNativeControl(CTRL_TOOLBAR, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT, + rRenderContext.DrawNativeControl(ControlType::Toolbar, IsHorizontal() ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT, aTBRect, nState, aControlValue, OUString()); } } @@ -259,7 +259,7 @@ void DockingAreaWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangl void DockingAreaWindow::Resize() { ImplInvalidateMenubar( this ); - if (IsNativeControlSupported(CTRL_TOOLBAR, PART_ENTIRE_CONTROL)) + if (IsNativeControlSupported(ControlType::Toolbar, PART_ENTIRE_CONTROL)) Invalidate(); } |