diff options
| author | Colin Snover | 2017-09-10 21:03:18 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-09-10 22:17:16 -0500 |
| commit | 6e2f18c498b6d40d8184dfe05993ac6d0ba99326 (patch) | |
| tree | a535c744015a37efd4fdbff23b5211356a08525f /backends/taskbar | |
| parent | 56810b5598458ce04dee4647a4044e9ca07a8577 (diff) | |
| download | scummvm-rg350-6e2f18c498b6d40d8184dfe05993ac6d0ba99326.tar.gz scummvm-rg350-6e2f18c498b6d40d8184dfe05993ac6d0ba99326.tar.bz2 scummvm-rg350-6e2f18c498b6d40d8184dfe05993ac6d0ba99326.zip | |
MACOS: Fix warnings about undeclared selectors
When -Wundeclared-selector is enabled (recommended by Apple), the
calls to the setBadgeLabel selector in MacOSXTaskbarManager are
warned on because NSDockTile declarations are not included because
they do not exist in macOS 10.4 and earlier. While I don't know
that we are even supporting such old macOS versions these days, it
is simple enough to fix this problem when compiling to modern
macOS versions by conditionally including the necessary header.
Diffstat (limited to 'backends/taskbar')
| -rw-r--r-- | backends/taskbar/macosx/macosx-taskbar.mm | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/backends/taskbar/macosx/macosx-taskbar.mm b/backends/taskbar/macosx/macosx-taskbar.mm index 692fa84429..f6d3be55ce 100644 --- a/backends/taskbar/macosx/macosx-taskbar.mm +++ b/backends/taskbar/macosx/macosx-taskbar.mm @@ -26,13 +26,10 @@ #if defined(MACOSX) && defined(USE_TASKBAR) -// NSDockTile was introduced with Mac OS X 10.5. -// Try provide backward compatibility by avoiding NSDockTile symbols. - #include "backends/taskbar/macosx/macosx-taskbar.h" #include "common/config-manager.h" #include "common/file.h" - +#include "backends/platform/sdl/macosx/macosx-compat.h" #include <AppKit/NSApplication.h> #include <AppKit/NSImage.h> #include <Foundation/NSString.h> @@ -44,7 +41,16 @@ #include <AppKit/NSBezierPath.h> #include <CoreFoundation/CFString.h> -id _dockTile; +// NSDockTile was introduced with Mac OS X 10.5. +// Try provide backward compatibility by avoiding NSDockTile symbols. +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 +typedef id NSDockTilePtr; +#else +#include <AppKit/NSDockTile.h> +typedef NSDockTile * NSDockTilePtr; +#endif + +NSDockTilePtr _dockTile; NSImageView *_applicationIconView; NSImageView *_overlayIconView; |