Fix some macOS deprecation warnings

examples/cocoa/CocoaAppDelegate.mm

@@ -34,8 +34,6 @@
 #define GREEN @"Green"
 #define RED   @"Red"
 
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
 // Our PIMPL
 struct SFMLmainWindow
 {
@@ -195,7 +193,7 @@ struct SFMLmainWindow
 - (IBAction)visibleChanged:(NSButton*)sender
 {
     if (self.initialized)
-        self.visible = [sender state] == NSOnState;
+        self.visible = [sender state] == NSControlStateValueOn;
 }
 
 - (IBAction)textChanged:(NSTextField*)sender

src/SFML/Window/CMakeLists.txt

@@ -335,6 +335,10 @@ elseif(SFML_OS_ANDROID)
     target_link_libraries(sfml-window PRIVATE android)
 endif()
 
+if(SFML_OS_MACOS OR SFML_OS_IOS)
+    target_compile_definitions(sfml-window PRIVATE GL_SILENCE_DEPRECATION)
+endif()
+
 # on some platforms (e.g. Raspberry Pi 3 armhf), GCC requires linking libatomic to use <atomic> features
 # that aren't supported by native CPU instructions (64-bit atomic operations on 32-bit architecture)
 if(SFML_COMPILER_GCC)

src/SFML/Window/macOS/SFApplication.m

@@ -28,8 +28,6 @@
 ////////////////////////////////////////////////////////////
 #import <SFML/Window/macOS/SFApplication.h>
 
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
 
 ////////////////////////////////////////////////////////////
 @implementation SFApplication
@@ -41,7 +39,7 @@
     [SFApplication sharedApplication]; // Make sure NSApp exists
     NSEvent* event = nil;
 
-    while ((event = [NSApp nextEventMatchingMask:NSAnyEventMask
+    while ((event = [NSApp nextEventMatchingMask:NSEventMaskAny
                                        untilDate:[NSDate distantPast]
                                           inMode:NSDefaultRunLoopMode
                                          dequeue:YES])) // Remove the event from the queue
@@ -142,7 +140,7 @@
         addItemWithTitle:@"Hide Others"
                   action:@selector(hideOtherApplications:)
            keyEquivalent:@"h"];
-    [hideOtherItem setKeyEquivalentModifierMask:(NSAlternateKeyMask | NSCommandKeyMask)];
+    [hideOtherItem setKeyEquivalentModifierMask:(NSEventModifierFlagOption | NSEventModifierFlagCommand)];
 
     // SHOW ALL
     [appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];
@@ -253,7 +251,7 @@
     // custom OpenGL view. See -[SFOpenGLView sfKeyUp:] for more details.
 
     id firstResponder = [[anEvent window] firstResponder];
-    if (([anEvent type] != NSKeyUp) || (![firstResponder tryToPerform:@selector(sfKeyUp:) with:anEvent]))
+    if (([anEvent type] != NSEventTypeKeyUp) || (![firstResponder tryToPerform:@selector(sfKeyUp:) with:anEvent]))
     {
         // It's either not a key up event or no responder has a sfKeyUp
         // message implemented.

src/SFML/Window/macOS/SFContext.mm

@@ -77,7 +77,7 @@ SFContext::SFContext(SFContext* shared, const ContextSettings& settings, Vector2
     // Create a dummy window/view pair (hidden) and assign it our context.
     m_window = [[NSWindow alloc]
         initWithContentRect:NSMakeRect(0, 0, size.x, size.y)
-                  styleMask:NSBorderlessWindowMask
+                  styleMask:NSWindowStyleMaskBorderless
                     backing:NSBackingStoreBuffered
                       defer:NO]; // Don't defer it!
     m_view   = [[NSOpenGLView alloc] initWithFrame:NSMakeRect(0, 0, size.x, size.y)];
@@ -148,7 +148,7 @@ void SFContext::setVerticalSyncEnabled(bool enabled)
     const AutoreleasePool pool;
     const GLint           swapInterval = enabled;
 
-    [m_context setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
+    [m_context setValues:&swapInterval forParameter:NSOpenGLContextParameterSwapInterval];
 }
 
 

src/SFML/Window/macOS/SFKeyboardModifiersHelper.mm

@@ -29,8 +29,6 @@
 #import <SFML/Window/macOS/SFKeyboardModifiersHelper.h>
 #include <SFML/Window/macOS/WindowImplCocoa.hpp>
 
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
 
 ////////////////////////////////////////////////////////////
 /// Here are define the mask value for the 'modifiers'
@@ -163,10 +161,10 @@ sf::Event::KeyPressed keyPressedEventWithModifiers(NSUInteger modifiers, sf::Key
     sf::Event::KeyPressed event;
     event.code     = key;
     event.scancode = code;
-    event.alt      = modifiers & NSAlternateKeyMask;
+    event.alt      = modifiers & NSEventModifierFlagOption;
-    event.control  = modifiers & NSControlKeyMask;
+    event.control  = modifiers & NSEventModifierFlagControl;
-    event.shift    = modifiers & NSShiftKeyMask;
+    event.shift    = modifiers & NSEventModifierFlagShift;
-    event.system   = modifiers & NSCommandKeyMask;
+    event.system   = modifiers & NSEventModifierFlagCommand;
     return event;
 }
 
@@ -177,10 +175,10 @@ sf::Event::KeyReleased keyReleasedEventWithModifiers(NSUInteger modifiers, sf::K
     sf::Event::KeyReleased event;
     event.code     = key;
     event.scancode = code;
-    event.alt      = modifiers & NSAlternateKeyMask;
+    event.alt      = modifiers & NSEventModifierFlagOption;
-    event.control  = modifiers & NSControlKeyMask;
+    event.control  = modifiers & NSEventModifierFlagControl;
-    event.shift    = modifiers & NSShiftKeyMask;
+    event.shift    = modifiers & NSEventModifierFlagShift;
-    event.system   = modifiers & NSCommandKeyMask;
+    event.system   = modifiers & NSEventModifierFlagCommand;
     return event;
 }
 

src/SFML/Window/macOS/SFOpenGLView+keyboard.mm

@@ -31,8 +31,6 @@
 #import <SFML/Window/macOS/SFOpenGLView+keyboard_priv.h>
 #include <SFML/Window/macOS/WindowImplCocoa.hpp>
 
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
 ////////////////////////////////////////////////////////////
 /// In this file, we implement keyboard handling for SFOpenGLView
 ///

src/SFML/Window/macOS/SFOpenGLView+mouse.mm

@@ -350,8 +350,8 @@
             // is dissociated from its position.
 
             // Ignore any non-move related event
-            if (([eventOrNil type] == NSMouseMoved) || ([eventOrNil type] == NSLeftMouseDragged) ||
+            if (([eventOrNil type] == NSEventTypeMouseMoved) || ([eventOrNil type] == NSEventTypeLeftMouseDragged) ||
-                ([eventOrNil type] == NSRightMouseDragged) || ([eventOrNil type] == NSOtherMouseDragged))
+                ([eventOrNil type] == NSEventTypeRightMouseDragged) || ([eventOrNil type] == NSEventTypeOtherMouseDragged))
             {
                 // Without this factor, the cursor flies around waaay too fast!
                 // But I don't know if it because of retina display or because

src/SFML/Window/macOS/SFOpenGLView.mm

@@ -33,8 +33,6 @@
 
 #include <SFML/System/Err.hpp>
 
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
 
 ////////////////////////////////////////////////////////////
 /// SFOpenGLView class: Privates Methods Declaration

src/SFML/Window/macOS/SFWindowController.mm

@@ -177,7 +177,7 @@
     NSRect              windowRect = NSMakeRect(0, 0, desktop.size.x, desktop.size.y);
     m_window                       = [[SFWindow alloc]
         initWithContentRect:windowRect
-                  styleMask:NSBorderlessWindowMask
+                  styleMask:NSWindowStyleMaskBorderless
                     backing:NSBackingStoreBuffered
                       defer:NO];
 
@@ -243,13 +243,13 @@
     NSRect rect = NSMakeRect(0, 0, mode.size.x, mode.size.y);
 
     // Convert the SFML window style to Cocoa window style.
-    unsigned int nsStyle = NSBorderlessWindowMask;
+    unsigned int nsStyle = NSWindowStyleMaskBorderless;
     if (style & sf::Style::Titlebar)
-        nsStyle |= NSTitledWindowMask | NSMiniaturizableWindowMask;
+        nsStyle |= NSWindowStyleMaskTitled | NSWindowStyleMaskMiniaturizable;
     if (style & sf::Style::Resize)
-        nsStyle |= NSResizableWindowMask;
+        nsStyle |= NSWindowStyleMaskResizable;
     if (style & sf::Style::Close)
-        nsStyle |= NSClosableWindowMask;
+        nsStyle |= NSWindowStyleMaskClosable;
 
     // Create the window.
     m_window = [[SFWindow alloc]
@@ -352,17 +352,17 @@
 - (void)setCursorGrabbed:(BOOL)grabbed
 {
     // Remove or restore resizeable style if needed
-    BOOL resizeable = (([m_window styleMask] & NSResizableWindowMask) != 0) ? YES : NO;
+    BOOL resizeable = (([m_window styleMask] & NSWindowStyleMaskResizable) != 0) ? YES : NO;
     if (grabbed && resizeable)
     {
         m_restoreResize     = YES;
-        NSUInteger newStyle = [m_window styleMask] & ~NSResizableWindowMask;
+        NSUInteger newStyle = [m_window styleMask] & ~NSWindowStyleMaskResizable;
         [m_window setStyleMask:newStyle];
     }
     else if (!grabbed && m_restoreResize)
     {
         m_restoreResize     = NO;
-        NSUInteger newStyle = [m_window styleMask] | NSResizableWindowMask;
+        NSUInteger newStyle = [m_window styleMask] | NSWindowStyleMaskResizable;
         [m_window setStyleMask:newStyle];
     }
 

src/SFML/Window/macOS/WindowImplCocoa.hpp

@@ -32,9 +32,6 @@
 #include <SFML/Window/WindowEnums.hpp>
 #include <SFML/Window/WindowImpl.hpp>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
 ////////////////////////////////////////////////////////////
 /// Predefine OBJ-C classes
 ////////////////////////////////////////////////////////////
@@ -387,5 +384,3 @@ private:
 } // namespace priv
 
 } // namespace sf
-
-#pragma GCC diagnostic pop

src/SFML/Window/macOS/WindowImplDelegateProtocol.h

@@ -36,9 +36,6 @@
 
 #include <cstdint>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
 namespace sf::priv
 {
 class WindowImplCocoa;
@@ -252,5 +249,3 @@ class WindowImplCocoa;
 - (void)applyContext:(NSOpenGLContext*)context;
 
 @end
-
-#pragma GCC diagnostic pop