diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-12-13 21:21:37 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-12-13 21:24:23 +0200 |
| commit | e3e15d8c625cbf56e1f03d9ebde966e78844c7a4 (patch) | |
| tree | 2700300bcdd0a04c4ff1e18a08b70922803980ed /vcl | |
| parent | fc6d5461da366df6fa10561e12923532071af0c8 (diff) | |
Use the non-deprecated NSEventMaskAny
(Exactly the same thing as the old name NSAnyEventMask. The naming
convention just has changed to use a common prefix: NSEventMask*
instead of NS*EventMask.)
Change-Id: I18a1ae0a2b399ac38567a0171b0d211dcc9faec1
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/osx/salinst.cxx | 10 | ||||
| -rw-r--r-- | vcl/osx/saltimer.cxx | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 6c2ca65c3050..b1c5774c21ff 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -516,10 +516,7 @@ bool AquaSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents) { SolarMutexReleaser aReleaser; -SAL_WNODEPRECATED_DECLARATIONS_PUSH - // 'NSAnyEventMask' is deprecated: first deprecated in macOS 10.12 - pEvent = [NSApp nextEventMatchingMask: NSAnyEventMask -SAL_WNODEPRECATED_DECLARATIONS_POP + pEvent = [NSApp nextEventMatchingMask: NSEventMaskAny untilDate: nil inMode: NSDefaultRunLoopMode dequeue: YES]; @@ -550,10 +547,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP { SolarMutexReleaser aReleaser; -SAL_WNODEPRECATED_DECLARATIONS_PUSH - // 'NSAnyEventMask' is deprecated: first deprecated in macOS 10.12 - pEvent = [NSApp nextEventMatchingMask: NSAnyEventMask -SAL_WNODEPRECATED_DECLARATIONS_POP + pEvent = [NSApp nextEventMatchingMask: NSEventMaskAny untilDate: [NSDate distantFuture] inMode: NSDefaultRunLoopMode dequeue: YES]; diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx index 43931d722ef8..79dac0fdee9f 100644 --- a/vcl/osx/saltimer.cxx +++ b/vcl/osx/saltimer.cxx @@ -56,10 +56,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP // so we peek the queue and post to the start, if empty. // Some Qt bugs even indicate nextEvent without dequeue // sometimes blocks, so we dequeue and re-add the event. -SAL_WNODEPRECATED_DECLARATIONS_PUSH -// 'NSAnyEventMask' is deprecated: first deprecated in macOS 10.12 - NSEvent* pPeekEvent = [NSApp nextEventMatchingMask: NSAnyEventMask -SAL_WNODEPRECATED_DECLARATIONS_POP + NSEvent* pPeekEvent = [NSApp nextEventMatchingMask: NSEventMaskAny untilDate: nil inMode: NSDefaultRunLoopMode dequeue: YES]; |