diff options
Diffstat (limited to 'vcl/source/window')
-rw-r--r-- | vcl/source/window/decoview.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/menubarwindow.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/menufloatingwindow.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/splitwin.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/status.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index 19d63b074e3f..083f13c19692 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -1053,7 +1053,7 @@ void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, boo return; } - mpOutDev->Push( PUSH_LINECOLOR ); + mpOutDev->Push( PushFlags::LINECOLOR ); if ( rStyleSettings.GetOptions() & STYLE_OPTION_MONO ) mpOutDev->SetLineColor( Color( COL_BLACK ) ); else diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 7a96ac850c87..9fd93c8e9b11 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -586,7 +586,7 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, bool bHighlight ) { // #107747# give menuitems the height of the menubar Rectangle aRect = Rectangle( Point( nX, 1 ), Size( pData->aSz.Width(), GetOutputSizePixel().Height()-2 ) ); - Push( PUSH_CLIPREGION ); + Push( PushFlags::CLIPREGION ); IntersectClipRegion( aRect ); bool bRollover = bHighlight && nPos != nHighlightedItem; if ( bHighlight ) @@ -899,7 +899,7 @@ void MenuBarWindow::Paint( const Rectangle& ) if( ! IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL) && GetSettings().GetStyleSettings().GetHighContrastMode() ) { - Push( PUSH_LINECOLOR | PUSH_MAPMODE ); + Push( PushFlags::LINECOLOR | PushFlags::MAPMODE ); SetLineColor( Color( COL_WHITE ) ); SetMapMode( MapMode( MAP_PIXEL ) ); Size aSize = GetSizePixel(); diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 9b2b4392ba5a..9ef3f91cdfc0 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -747,7 +747,7 @@ void MenuFloatingWindow::HighlightItem( sal_uInt16 nPos, bool bHighlight ) if( IsNativeControlSupported( CTRL_MENU_POPUP, PART_ENTIRE_CONTROL ) ) { Size aPxSize( GetOutputSizePixel() ); - Push( PUSH_CLIPREGION ); + Push( PushFlags::CLIPREGION ); IntersectClipRegion( Rectangle( Point( nX, nY ), Size( aSz.Width(), pData->aSz.Height() ) ) ); Rectangle aCtrlRect( Point( nX, 0 ), Size( aPxSize.Width()-nX, aPxSize.Height() ) ); MenupopupValue aVal( pMenu->nTextPos-GUTTERBORDER, aItemRect ); diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 4c07b25392a2..368f7cbe6ac8 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -911,7 +911,7 @@ void SplitWindow::ImplDrawBack( SplitWindow* pWindow, const Rectangle& rRect, { Point aPos = rRect.TopLeft(); Size aBmpSize = pBitmap->GetSizePixel(); - pWindow->Push( PUSH_CLIPREGION ); + pWindow->Push( PushFlags::CLIPREGION ); pWindow->IntersectClipRegion( rRect ); do { diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 82d99d01141c..c4ccf055f433 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -495,7 +495,7 @@ void DrawProgress( vcl::Window* pWindow, const Point& rPos, INVALIDATE_TRANSPARENT ); pEraseWindow->Update(); } - pWindow->Push( PUSH_CLIPREGION ); + pWindow->Push( PushFlags::CLIPREGION ); pWindow->IntersectClipRegion( rFramePosSize ); } bool bNativeOK = pWindow->DrawNativeControl( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, 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 diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 8d8eb6cea652..cc9763b17ed9 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3842,7 +3842,7 @@ void Window::DrawGradientWallpaper( long nX, long nY, mpMetaFile = NULL; EnableMapMode( false ); - Push( PUSH_CLIPREGION ); + Push( PushFlags::CLIPREGION ); IntersectClipRegion( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ) ); if( rWallpaper.GetStyle() == WALLPAPER_APPLICATIONGRADIENT ) |