diff options
author | Tor Lillqvist <tml@iki.fi> | 2020-07-05 19:23:27 +0300 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-24 10:03:12 +0100 |
commit | 0af22a7e7088516b37647a9f72943f4ee5b536b4 (patch) | |
tree | 47c7e83cbe2c500a8d98a9eacc3b65406b530821 | |
parent | Avoid unused parameter warning in the !HAVE_FEATURE_PDFIUM case (diff) | |
download | core-0af22a7e7088516b37647a9f72943f4ee5b536b4.tar.gz core-0af22a7e7088516b37647a9f72943f4ee5b536b4.zip |
Avoid warning about deprecation in macOS 11.0
Change-Id: Ie1a7e19093b439eb133632ee881e1e3dbe58132d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98176
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106459
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | vcl/osx/salframe.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 6f7a395522cf..71cc5a4f1982 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -1279,8 +1279,11 @@ SAL_WNODEPRECATED_DECLARATIONS_POP aStyleSettings.GetHighlightTextColor(), mpNSWindow ) ); aStyleSettings.SetHighlightTextColor( aHighlightTextColor ); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" Color aMenuHighlightColor( getColor( [NSColor selectedMenuItemColor], aStyleSettings.GetMenuHighlightColor(), mpNSWindow ) ); +#pragma clang diagnostic pop aStyleSettings.SetMenuHighlightColor( aMenuHighlightColor ); Color aMenuHighlightTextColor( getColor( [NSColor selectedMenuItemTextColor], aStyleSettings.GetMenuHighlightTextColor(), mpNSWindow ) ); |