diff options
| author | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2018-11-27 11:40:49 +0100 |
|---|---|---|
| committer | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2018-11-29 14:08:26 +0100 |
| commit | 9c0d40fbc7d01ff46b78b798361bf3a19cc18bdc (patch) | |
| tree | a2afd07ced2da313c5cdc6183bb1ea7e832d9a7e /vcl/osx | |
| parent | a55d15e27f4290b9aaf5597161b2b3c5200d3f85 (diff) | |
Rename Mac OS X to official name macOS in comments and documentation
Change-Id: I651b7f202fa52ff5f5357a11aa72c43eb7dc7f95
Reviewed-on: https://gerrit.libreoffice.org/64102
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'vcl/osx')
| -rw-r--r-- | vcl/osx/salframe.cxx | 4 | ||||
| -rw-r--r-- | vcl/osx/salnativewidgets.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 50a899c9da4d..2a8eeb0b0af1 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -1185,7 +1185,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP aStyleSettings.SetToolbarIconSize( ToolbarIconSize::Large ); - // TODO: better mapping of OS X<->LibreOffice font settings + // TODO: better mapping of macOS<->LibreOffice font settings vcl::Font aLabelFont( getFont( [NSFont labelFontOfSize: 0], nDPIY, aAppFont ) ); aStyleSettings.BatchSetFonts( aAppFont, aLabelFont ); vcl::Font aMenuFont( getFont( [NSFont menuFontOfSize: 0], nDPIY, aAppFont ) ); @@ -1220,7 +1220,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP aStyleSettings.SetCursorBlinkTime( 500 ); - // no mnemonics on OS X + // no mnemonics on macOS aStyleSettings.SetOptions( aStyleSettings.GetOptions() | StyleSettingsOptions::NoMnemonics ); getAppleScrollBarVariant(aStyleSettings); diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx index 0026d68a0dbd..cab5ae940a3c 100644 --- a/vcl/osx/salnativewidgets.cxx +++ b/vcl/osx/salnativewidgets.cxx @@ -803,7 +803,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType, aTextDrawInfo.state=getState( nState ); aTextDrawInfo.isFocused=false; - rc.size.width+=1;//else there's a white space because an OS X theme has no 3D border + rc.size.width+=1; // else there's a white space because a macOS theme has no 3D border rc.size.height+=1; HIThemeDrawFrame(&rc, &aTextDrawInfo, mrContext, kHIThemeOrientationNormal); @@ -825,7 +825,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType, aTextDrawInfo.state=getState( nState ); aTextDrawInfo.isFocused=false; - rc.size.width += 1; // else there may be a white space because an OS X theme has no 3D border + rc.size.width += 1; // else there may be a white space because a macOS theme has no 3D border // change rc so that the frame will encompass only the content region // see counterpart in GetNativeControlRegion rc.size.width += 2; |