From 2853f38965f521cafb8991737db1c655960acc72 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu, 18 Feb 2021 16:05:34 -0800
Subject: [PATCH] xquartz: Remove a workaround for AppKit versions older than
 Lion

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 72a39dccf99191fbfbb4b399c446fd017d55f24e)
---
 hw/xquartz/X11Controller.m | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index c0604b773..ad7a7871e 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -785,16 +785,7 @@ extern char *bundle_id_prefix;
     BOOL pbproxy_active =
         [NSApp prefs_get_boolean:@PREFS_SYNC_PB default:YES];
 
-    // Remove preferences from the GUI which are not supported
-    // TODO: Change 1117 to NSAppKitVersionNumber10_7 when it is defined
-    if (scroll_in_device_direction && NSAppKitVersionNumber < 1117) {
-        [scroll_in_device_direction removeFromSuperview];
-        scroll_in_device_direction = nil;
-    }
-    else {
-        [scroll_in_device_direction setIntValue:
-         XQuartzScrollInDeviceDirection];
-    }
+    [scroll_in_device_direction setIntValue:XQuartzScrollInDeviceDirection];
 
     [fake_buttons setIntValue:darwinFakeButtons];
     [enable_keyequivs setIntValue:XQuartzEnableKeyEquivalents];