OSDN Git Service

Since 10.6 is no longer of interest, removed the redeclarations that were used for it.
authorEric Branlund <ebranlund@fastmail.com>
Wed, 26 Feb 2020 07:20:36 +0000 (23:20 -0800)
committerEric Branlund <ebranlund@fastmail.com>
Wed, 26 Feb 2020 07:20:36 +0000 (23:20 -0800)
src/main-cocoa.m

index 451ae3f..9cee326 100644 (file)
@@ -68,17 +68,6 @@ enum
     AngbandEventWakeup = 1
 };
 
-/* Redeclare some 10.7 constants and methods so we can build on 10.6 */
-enum
-{
-    Angband_NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7,
-    Angband_NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8
-};
-
-@interface NSWindow (AngbandLionRedeclares)
-- (void)setRestorable:(BOOL)flag;
-@end
-
 /* Delay handling of pre-emptive "quit" event */
 static BOOL quit_when_ready = FALSE;
 
@@ -2536,8 +2525,8 @@ static void Term_init_cocoa(term *t)
            NSWindowCollectionBehavior behavior = [window collectionBehavior];
            behavior |=
                (termIdx == 0 ?
-                Angband_NSWindowCollectionBehaviorFullScreenPrimary :
-                Angband_NSWindowCollectionBehaviorFullScreenAuxiliary);
+                NSWindowCollectionBehaviorFullScreenPrimary :
+                NSWindowCollectionBehaviorFullScreenAuxiliary);
            [window setCollectionBehavior:behavior];
        }