diff options
Diffstat (limited to 'backends/taskbar/macosx/macosx-taskbar.mm')
| -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; |