From 31581c0f411e288c94fe12c8033a969c701624e2 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 25 Jun 2020 16:12:55 +0200
Subject: [PATCH] supporting native large control sizes

---
 src/osx/cocoa/button.mm  | 3 +++
 src/osx/cocoa/choice.mm  | 3 +++
 src/osx/cocoa/gauge.mm   | 3 +++
 src/osx/cocoa/listbox.mm | 6 ++++++
 src/osx/cocoa/window.mm  | 5 +++++
 5 files changed, 20 insertions(+)

diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index efcc3cb52c..5976163c8b 100644
--- a/src/osx/cocoa/button.mm
+++ b/src/osx/cocoa/button.mm
@@ -156,6 +156,9 @@ void wxButtonCocoaImpl::GetLayoutInset(int &left , int &top , int &right, int &b
     {
         switch( size )
         {
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
+            case NSControlSizeLarge:
+#endif
             case NSRegularControlSize:
                 left = right = 6;
                 top = 4;
diff --git a/src/osx/cocoa/choice.mm b/src/osx/cocoa/choice.mm
index bcad4b29b3..c0f87584e3 100644
--- a/src/osx/cocoa/choice.mm
+++ b/src/osx/cocoa/choice.mm
@@ -88,6 +88,9 @@ public:
         
         switch( size )
         {
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
+            case NSControlSizeLarge:
+#endif
             case NSRegularControlSize:
                 left = right = 3;
                 top = 2;
diff --git a/src/osx/cocoa/gauge.mm b/src/osx/cocoa/gauge.mm
index c28ddd08f0..244a316c1f 100644
--- a/src/osx/cocoa/gauge.mm
+++ b/src/osx/cocoa/gauge.mm
@@ -78,6 +78,9 @@ public :
 
         switch( size )
         {
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
+            case NSControlSizeLarge:
+#endif
             case NSRegularControlSize:
                 left = right = 2;
                 top = 0;
diff --git a/src/osx/cocoa/listbox.mm b/src/osx/cocoa/listbox.mm
index d8847e5ae3..766686a81f 100644
--- a/src/osx/cocoa/listbox.mm
+++ b/src/osx/cocoa/listbox.mm
@@ -25,6 +25,7 @@
 #endif
 
 #include "wx/osx/private.h"
+#include "wx/osx/private/available.h"
 
 // forward decls
 
@@ -422,6 +423,11 @@ wxListWidgetColumn* wxListWidgetCocoaImpl::InsertCheckColumn( unsigned pos , con
                 break ;
 
             case wxWINDOW_VARIANT_LARGE :
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
+                if ( WX_IS_MACOS_AVAILABLE( 10, 16 ))
+                    size = NSControlSizeLarge;
+                else
+#endif
                 size = NSRegularControlSize;
                 break ;
 
diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index c3987f20a5..9e50b7a904 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -3504,6 +3504,11 @@ void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
             break ;
 
         case wxWINDOW_VARIANT_LARGE :
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
+            if ( WX_IS_MACOS_AVAILABLE( 10, 16 ))
+                size = NSControlSizeLarge;
+            else
+#endif
             size = NSRegularControlSize;
             break ;