From 305a164e8b1094a041373ab9808aedcf4c76a1b6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 18 Feb 2016 14:28:47 +0000 Subject: StyleSettingsOptions::SpinArrow is not set by anyone Tragically this means the loss of a OS/2 comment Change-Id: Ia3f7b0a840e6b73cf4fae5f98dd4cf97d4e7b87c --- vcl/source/control/spinfld.cxx | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) (limited to 'vcl/source/control/spinfld.cxx') diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 59208e32374c..032bdc163637 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -201,33 +201,15 @@ void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow SymbolType eType1, eType2; - const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); - if ( rStyleSettings.GetOptions() & StyleSettingsOptions::SpinArrow ) + if ( bHorz ) { - // arrows are only use in OS/2 look - if ( bHorz ) - { - eType1 = bMirrorHorz ? SymbolType::ARROW_RIGHT : SymbolType::ARROW_LEFT; - eType2 = bMirrorHorz ? SymbolType::ARROW_LEFT : SymbolType::ARROW_RIGHT; - } - else - { - eType1 = SymbolType::ARROW_UP; - eType2 = SymbolType::ARROW_DOWN; - } + eType1 = bMirrorHorz ? SymbolType::SPIN_RIGHT : SymbolType::SPIN_LEFT; + eType2 = bMirrorHorz ? SymbolType::SPIN_LEFT : SymbolType::SPIN_RIGHT; } else { - if ( bHorz ) - { - eType1 = bMirrorHorz ? SymbolType::SPIN_RIGHT : SymbolType::SPIN_LEFT; - eType2 = bMirrorHorz ? SymbolType::SPIN_LEFT : SymbolType::SPIN_RIGHT; - } - else - { - eType1 = SymbolType::SPIN_UP; - eType2 = SymbolType::SPIN_DOWN; - } + eType1 = SymbolType::SPIN_UP; + eType2 = SymbolType::SPIN_DOWN; } DrawButtonFlags nStyle = DrawButtonFlags::NoLeftLightBorder; @@ -283,6 +265,8 @@ void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow aLowRect.Top()++; } + const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); + DrawSymbolFlags nSymStyle = DrawSymbolFlags::NONE; if (!bUpperEnabled) nSymStyle |= DrawSymbolFlags::Disable; -- cgit