diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-07 19:57:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-08 06:39:48 +0000 |
| commit | 7fb70ff650ce3a1e4a39bd1b936f511d6be8986c (patch) | |
| tree | 9e5cbb12d215ca22bd1d1500a0d378b197dcdf04 /vcl/osx | |
| parent | c941b5a103b5f2105106834c74842a3909216f9a (diff) | |
Convert ButtonValue to scoped enum
Change-Id: Ia882914fb99844f21ce89d7218321933ef084b22
Reviewed-on: https://gerrit.libreoffice.org/26036
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/osx')
| -rw-r--r-- | vcl/osx/salnativewidgets.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx index 901fbf250d96..80b847c9b6fc 100644 --- a/vcl/osx/salnativewidgets.cxx +++ b/vcl/osx/salnativewidgets.cxx @@ -101,16 +101,16 @@ static ThemeButtonValue ImplGetButtonValue( ButtonValue aButtonValue ) { switch( aButtonValue ) { - case BUTTONVALUE_ON: + case ButtonValue::On: return kThemeButtonOn; break; - case BUTTONVALUE_OFF: + case ButtonValue::Off: return kThemeButtonOff; break; - case BUTTONVALUE_MIXED: - case BUTTONVALUE_DONTKNOW: + case ButtonValue::Mixed: + case ButtonValue::DontKnow: default: return kThemeButtonMixed; break; @@ -612,7 +612,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType, { ButtonValue aButtonValue = aValue.getTristateVal(); - if( AllSettings::GetLayoutRTL() && aButtonValue == BUTTONVALUE_OFF ) + if( AllSettings::GetLayoutRTL() && aButtonValue == ButtonValue::Off ) { // FIXME: a value of kThemeDisclosureLeft // should draw a theme compliant left disclosure triangle @@ -645,9 +645,9 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType, aInfo.adornment = kThemeAdornmentNone; switch( aButtonValue ) { - case BUTTONVALUE_ON: aInfo.value = kThemeDisclosureDown;//expanded + case ButtonValue::On: aInfo.value = kThemeDisclosureDown;//expanded break; - case BUTTONVALUE_OFF: + case ButtonValue::Off: // FIXME: this should have drawn a theme compliant disclosure triangle // (see above) if( AllSettings::GetLayoutRTL() ) @@ -655,7 +655,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType, aInfo.value = kThemeDisclosureLeft;//collapsed, RTL } break; - case BUTTONVALUE_DONTKNOW: //what to do? + case ButtonValue::DontKnow: //what to do? default: break; } @@ -978,12 +978,12 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType, switch( aValue.getTristateVal() ) { - case BUTTONVALUE_ON: aSpinInfo.value = kThemeButtonOn; + case ButtonValue::On: aSpinInfo.value = kThemeButtonOn; break; - case BUTTONVALUE_OFF: aSpinInfo.value = kThemeButtonOff; + case ButtonValue::Off: aSpinInfo.value = kThemeButtonOff; break; - case BUTTONVALUE_MIXED: - case BUTTONVALUE_DONTKNOW: + case ButtonValue::Mixed: + case ButtonValue::DontKnow: default: aSpinInfo.value = kThemeButtonMixed; break; } |