summaryrefslogtreecommitdiff
path: root/vcl/source/control
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/control')
-rw-r--r--vcl/source/control/button.cxx6
-rw-r--r--vcl/source/control/scrbar.cxx12
-rw-r--r--vcl/source/control/spinfld.cxx18
3 files changed, 18 insertions, 18 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index b036aeeece2b..659b25fe78e4 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -805,7 +805,7 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice* pDev, sal_uLong nDrawFl
Color aColor;
OUString aText = PushButton::GetText(); // PushButton:: because of MoreButton
sal_uInt16 nTextStyle = ImplGetTextStyle( nDrawFlags );
- sal_uInt16 nStyle;
+ DrawSymbolFlags nStyle;
if( aInRect.Right() < aInRect.Left() || aInRect.Bottom() < aInRect.Top() )
aInRect.SetEmpty();
@@ -827,9 +827,9 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice* pDev, sal_uLong nDrawFl
pDev->SetTextColor( aColor );
if ( IsEnabled() || (nDrawFlags & WINDOW_DRAW_NODISABLE) )
- nStyle = 0;
+ nStyle = DrawSymbolFlags::NONE;
else
- nStyle = SYMBOL_DRAW_DISABLE;
+ nStyle = DrawSymbolFlags::Disable;
Size aSize = rRect.GetSize();
Point aPos = rRect.TopLeft();
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index b5baa3ee4bbf..912e17c865e9 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -658,9 +658,9 @@ void ScrollBar::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFla
nStyle |= BUTTON_DRAW_PRESSED;
aTempRect = aDecoView.DrawButton( maBtn1Rect, nStyle );
ImplCalcSymbolRect( aTempRect );
- nStyle = 0;
+ DrawSymbolFlags nSymbolStyle = DrawSymbolFlags::NONE;
if ((mnStateFlags & SCRBAR_STATE_BTN1_DISABLE) || !bEnabled)
- nStyle |= SYMBOL_DRAW_DISABLE;
+ nSymbolStyle |= DrawSymbolFlags::Disable;
if (rStyleSettings.GetOptions() & STYLE_OPTION_SCROLLARROW)
{
if (GetStyle() & WB_HORZ)
@@ -675,7 +675,7 @@ void ScrollBar::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFla
else
eSymbolType = SymbolType::SPIN_UP;
}
- aDecoView.DrawSymbol(aTempRect, eSymbolType, rStyleSettings.GetButtonTextColor(), nStyle);
+ aDecoView.DrawSymbol(aTempRect, eSymbolType, rStyleSettings.GetButtonTextColor(), nSymbolStyle);
}
if ((nDrawFlags & SCRBAR_DRAW_BTN2) && (!pWin || !ImplDrawNative(rRenderContext, SCRBAR_DRAW_BTN2)))
@@ -685,9 +685,9 @@ void ScrollBar::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFla
nStyle |= BUTTON_DRAW_PRESSED;
aTempRect = aDecoView.DrawButton(maBtn2Rect, nStyle);
ImplCalcSymbolRect(aTempRect);
- nStyle = 0;
+ DrawSymbolFlags nSymbolStyle = DrawSymbolFlags::NONE;
if ((mnStateFlags & SCRBAR_STATE_BTN2_DISABLE) || !bEnabled)
- nStyle |= SYMBOL_DRAW_DISABLE;
+ nSymbolStyle |= DrawSymbolFlags::Disable;
if (rStyleSettings.GetOptions() & STYLE_OPTION_SCROLLARROW)
{
if (GetStyle() & WB_HORZ)
@@ -702,7 +702,7 @@ void ScrollBar::ImplDraw(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFla
else
eSymbolType = SymbolType::SPIN_DOWN;
}
- aDecoView.DrawSymbol(aTempRect, eSymbolType, rStyleSettings.GetButtonTextColor(), nStyle);
+ aDecoView.DrawSymbol(aTempRect, eSymbolType, rStyleSettings.GetButtonTextColor(), nSymbolStyle);
}
rRenderContext.SetLineColor();
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 450f51d2972d..6ba5d91224d1 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -144,7 +144,7 @@ void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow
DecorationView aDecoView(&rRenderContext);
sal_uInt16 nStyle = BUTTON_DRAW_NOLEFTLIGHTBORDER;
- sal_uInt16 nSymStyle = 0;
+ DrawSymbolFlags nSymStyle = DrawSymbolFlags::NONE;
SymbolType eType1, eType2;
@@ -268,14 +268,14 @@ void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow
aLowRect.Top()++;
}
- nTempStyle = nSymStyle;
+ DrawSymbolFlags nTempSymStyle = nSymStyle;
if (!bUpperEnabled)
- nTempStyle |= SYMBOL_DRAW_DISABLE;
+ nTempSymStyle |= DrawSymbolFlags::Disable;
if (!bNativeOK)
- aDecoView.DrawSymbol(aUpRect, eType1, rStyleSettings.GetButtonTextColor(), nTempStyle);
+ aDecoView.DrawSymbol(aUpRect, eType1, rStyleSettings.GetButtonTextColor(), nTempSymStyle);
if (!bLowerEnabled)
- nSymStyle |= SYMBOL_DRAW_DISABLE;
+ nSymStyle |= DrawSymbolFlags::Disable;
if (!bNativeOK)
aDecoView.DrawSymbol(aLowRect, eType2, rStyleSettings.GetButtonTextColor(), nSymStyle);
}
@@ -622,8 +622,8 @@ void SpinField::Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRec
if (rRenderContext.GetSettings().GetStyleSettings().GetOptions() & STYLE_OPTION_SPINUPDOWN)
eSymbol = SymbolType::SPIN_UPDOWN;
- nStyle = IsEnabled() ? 0 : SYMBOL_DRAW_DISABLE;
- aView.DrawSymbol(aInnerRect, eSymbol, rRenderContext.GetSettings().GetStyleSettings().GetButtonTextColor(), nStyle);
+ DrawSymbolFlags nSymbolStyle = IsEnabled() ? DrawSymbolFlags::NONE : DrawSymbolFlags::Disable;
+ aView.DrawSymbol(aInnerRect, eSymbol, rRenderContext.GetSettings().GetStyleSettings().GetButtonTextColor(), nSymbolStyle);
}
Edit::Paint(rRenderContext, rRect);
@@ -1029,8 +1029,8 @@ void SpinField::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
if ( GetSettings().GetStyleSettings().GetOptions() & STYLE_OPTION_SPINUPDOWN )
eSymbol = SymbolType::SPIN_UPDOWN;
- nStyle = ( IsEnabled() || ( nFlags & WINDOW_DRAW_NODISABLE ) ) ? 0 : SYMBOL_DRAW_DISABLE;
- aView.DrawSymbol( aInnerRect, eSymbol, aButtonTextColor, nStyle );
+ DrawSymbolFlags nSymbolStyle = ( IsEnabled() || ( nFlags & WINDOW_DRAW_NODISABLE ) ) ? DrawSymbolFlags::NONE : DrawSymbolFlags::Disable;
+ aView.DrawSymbol( aInnerRect, eSymbol, aButtonTextColor, nSymbolStyle );
}
if ( GetStyle() & WB_SPIN )
generated by cgit (git 2.34.1) at 2025-01-09 07:09:40 +0000