Merge pull request #1531 from ychin/fix-xcode8-build

Fix code to be buildable on Xcode 8 again

Author: ychin

src/MacVim/MMCoreTextView.h

@@ -88,7 +88,9 @@ NS_ASSUME_NONNULL_BEGIN
 // NSFontChanging methods
 //
 - (void)changeFont:(nullable id)sender;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
 - (NSFontPanelModeMask)validModesForFontPanel:(NSFontPanel *)fontPanel;
+#endif
 
 //
 // NSMenuItemValidation

src/MacVim/MMCoreTextView.m

@@ -1355,13 +1355,15 @@ - (void)changeFont:(id)sender
     }
 }
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14
 - (NSFontPanelModeMask)validModesForFontPanel:(NSFontPanel *)fontPanel
 {
     // Lets the user pick only the font face / size, as other properties as not
     // useful. Still enable text/document colors as these affect the preview.
     // Otherwise it could just be white text on white background in the preview.
     return NSFontPanelModesMaskStandardModes & (~NSFontPanelModeMaskAllEffects | NSFontPanelModeMaskTextColorEffect | NSFontPanelModeMaskDocumentColorEffect);
 }
+#endif
 
 /// Specifies whether the menu item should be enabled/disabled.
 - (BOOL)validateMenuItem:(NSMenuItem *)item

src/MacVim/MacVim.h

@@ -43,6 +43,9 @@
 #ifndef MAC_OS_X_VERSION_10_14
 # define MAC_OS_X_VERSION_10_14 101400
 #endif
+#ifndef MAC_OS_X_VERSION_10_15
+# define MAC_OS_X_VERSION_10_15 101500
+#endif
 #ifndef MAC_OS_VERSION_11_0
 # define MAC_OS_VERSION_11_0 110000
 #endif
@@ -55,13 +58,19 @@
 #ifndef MAC_OS_VERSION_14_0
 # define MAC_OS_VERSION_14_0 140000
 #endif
+#ifndef MAC_OS_VERSION_15_0
+# define MAC_OS_VERSION_15_0 150000
+#endif
 
 #ifndef NSAppKitVersionNumber10_10
 # define NSAppKitVersionNumber10_10 1343
 #endif
 #ifndef NSAppKitVersionNumber10_10_Max
 # define NSAppKitVersionNumber10_10_Max 1349
 #endif
+#ifndef NSAppKitVersionNumber10_11
+# define NSAppKitVersionNumber10_11 1404
+#endif
 #ifndef NSAppKitVersionNumber10_12
 # define NSAppKitVersionNumber10_12 1504
 #endif
@@ -74,6 +83,9 @@
 #ifndef NSAppKitVersionNumber10_14
 # define NSAppKitVersionNumber10_14 1671
 #endif
+#ifndef NSAppKitVersionNumber10_15
+# define NSAppKitVersionNumber10_15 1894
+#endif
 #ifndef NSAppKitVersionNumber11_0
 # define NSAppKitVersionNumber11_0 2022
 #endif