From 9605fc54c790b1c4364bc0eddfcdd65f979bfc21 Mon Sep 17 00:00:00 2001
From: Daniel Ting <danielzting@gmail.com>
Date: Wed, 8 Jul 2020 18:02:38 -0500
Subject: Fix cancel/OK button order on macOS

The macOS platform convention regarding button order is cancel on left,
OK on right.
---
 doc/classes/DisplayServer.xml   | 2 +-
 doc/classes/ProjectSettings.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc/classes')

diff --git a/doc/classes/DisplayServer.xml b/doc/classes/DisplayServer.xml
index d118cf8205..49af8d7de2 100644
--- a/doc/classes/DisplayServer.xml
+++ b/doc/classes/DisplayServer.xml
@@ -139,7 +139,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_swap_ok_cancel">
+		<method name="get_swap_cancel_ok">
 			<return type="bool">
 			</return>
 			<description>
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index c8427ac61f..e255ce2e1a 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -472,8 +472,8 @@
 		<member name="gui/common/default_scroll_deadzone" type="int" setter="" getter="" default="0">
 			Default value for [member ScrollContainer.scroll_deadzone], which will be used for all [ScrollContainer]s unless overridden.
 		</member>
-		<member name="gui/common/swap_ok_cancel" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], swaps OK and Cancel buttons in dialogs on Windows and UWP to follow interface conventions.
+		<member name="gui/common/swap_cancel_ok" type="bool" setter="" getter="" default="false">
+			If [code]true[/code], swaps Cancel and OK buttons in dialogs on Windows and UWP to follow interface conventions.
 		</member>
 		<member name="gui/common/text_edit_undo_stack_max_size" type="int" setter="" getter="" default="1024">
 		</member>
-- 
cgit v1.2.3