diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-10-04 10:14:00 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-10-04 21:40:18 +0200 |
| commit | 2f2c9df8e270ede0fd71b146380c3883b75d8f0d (patch) | |
| tree | 0be279529fc1813814e7c1d91adcf75bbdca562f /vcl/osx/salframe.cxx | |
| parent | 1371c2f4edab5086af6d0661de046252def29455 (diff) | |
-Werror,-Wdeprecated-declarations (--with-macosx-version-min-required=10.14)
These are all the cases where the warning doesn't suggest a direct replacement,
so the existing code is just wrapped in SAL_WNODEPRECATED_PUSH/POP for now. A
companion commit will cover cases where there is a direct replacement that can
probably be applied (even backwards-compatibly with our current baseline,
hopefully).
Change-Id: I899537cb36dd69e08b5442ad4af7ce69ce2ddaec
Reviewed-on: https://gerrit.libreoffice.org/61354
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/osx/salframe.cxx')
| -rw-r--r-- | vcl/osx/salframe.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 50dade6ff32c..e0ec4ccb0d5f 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -1094,7 +1094,11 @@ static Color getColor( NSColor* pSysColor, const Color& rDefault, NSWindow* pWin if( pSysColor ) { // transform to RGB +SAL_WNODEPRECATED_DECLARATIONS_PUSH + // "'colorUsingColorSpaceName:device:' is deprecated: first deprecated in macOS 10.14 - + // Use -colorUsingType: or -colorUsingColorSpace: instead" NSColor* pRBGColor = [pSysColor colorUsingColorSpaceName: NSDeviceRGBColorSpace device: [pWin deviceDescription]]; +SAL_WNODEPRECATED_DECLARATIONS_POP if( pRBGColor ) { CGFloat r = 0, g = 0, b = 0, a = 0; @@ -1150,7 +1154,12 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings ) OSX_SALDATA_RUNINMAIN( UpdateSettings( rSettings ) ) +SAL_WNODEPRECATED_DECLARATIONS_PUSH + // "'lockFocus' is deprecated: first deprecated in macOS 10.14 - To draw, subclass NSView + // and implement -drawRect:; AppKit's automatic deferred display mechanism will call + // -drawRect: as necessary to display the view." [mpNSView lockFocus]; +SAL_WNODEPRECATED_DECLARATIONS_POP StyleSettings aStyleSettings = rSettings.GetStyleSettings(); @@ -1230,7 +1239,12 @@ SAL_WNODEPRECATED_DECLARATIONS_POP // don't draw frame around each and every toolbar ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames = true; +SAL_WNODEPRECATED_DECLARATIONS_PUSH + // "'unlockFocus' is deprecated: first deprecated in macOS 10.14 - To draw, subclass NSView + // and implement -drawRect:; AppKit's automatic deferred display mechanism will call + // -drawRect: as necessary to display the view." [mpNSView unlockFocus]; +SAL_WNODEPRECATED_DECLARATIONS_POP } const SystemEnvData* AquaSalFrame::GetSystemData() const |