From 0458c150602313ca5d87a1e5eda8374228bb760d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guilloux?= Date: Mon, 9 Oct 2023 19:35:15 +0200 Subject: [PATCH] Cleanup: [MacOS] Remove unneeded WITH_SDL checks (#11360) --- src/os/macosx/macos.mm | 16 +--------------- src/os/macosx/osx_main.cpp | 4 ---- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/os/macosx/macos.mm b/src/os/macosx/macos.mm index 9baeea9cff..bc97f6cdce 100644 --- a/src/os/macosx/macos.mm +++ b/src/os/macosx/macos.mm @@ -93,21 +93,7 @@ void GetMacOSVersion(int *return_major, int *return_minor, int *return_bugfix) #endif } -#ifdef WITH_SDL - -/** - * Show the system dialogue message (SDL on MacOSX). - * - * @param title Window title. - * @param message Message text. - * @param buttonLabel Button text. - */ -void ShowMacDialog(const char *title, const char *message, const char *buttonLabel) -{ - NSRunAlertPanel([ NSString stringWithUTF8String:title ], [ NSString stringWithUTF8String:message ], [ NSString stringWithUTF8String:buttonLabel ], nil, nil); -} - -#elif defined WITH_COCOA +#ifdef WITH_COCOA extern void CocoaDialog(const char *title, const char *message, const char *buttonLabel); diff --git a/src/os/macosx/osx_main.cpp b/src/os/macosx/osx_main.cpp index 856d48f9b4..f33e371436 100644 --- a/src/os/macosx/osx_main.cpp +++ b/src/os/macosx/osx_main.cpp @@ -16,10 +16,6 @@ #include #include -#if defined(WITH_SDL) -/* the mac implementation needs this file included in the same file as main() */ -# include -#endif #include "macos.h" #include "../../safeguards.h"