From 723e61a4b572e93b7731e22d7f7d7f7982f94bc3 Mon Sep 17 00:00:00 2001
From: sbrowne <sbrowne@unknown>
Date: Sat, 18 Jul 2015 14:46:53 +0200
Subject: [PATCH] Adjust inset border values for OS X >= 10.6.

The bottom border was off by one pixel, use the values tested to work for OS X
10.[6789].

See #16808.

(this is a backport of cb0625b9d9b96b751eb748463f3aa60697bbf5ce from master)
---
 docs/changes.txt        | 1 +
 src/osx/cocoa/button.mm | 6 +++---
 src/osx/cocoa/choice.mm | 4 ++--
 src/osx/cocoa/gauge.mm  | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index cbb2b368f0..db09133f7a 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -643,6 +643,7 @@ wxOSX:
 - Generate wxEVT_TEXT_ENTER for wxTE_PASSWORD controls too (mj_smoker).
 - Send wxIconizeEvent when a window is iconized/restore (Rob Krakora).
 - Use correct colour for disabled wxStaticText (sbrowne).
+- Fix bottom margins sizes for several controls (sbrowne).
 - Fix initial position of controls with layout insets (Tim Kosse).
 - Don't allow pasting rich text in non-wxTE_RICH text controls (Tim Kosse).
 - Fix printing all pages non-interactively (John Roberts).
diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index d10797440e..f38947d96f 100644
--- a/src/osx/cocoa/button.mm
+++ b/src/osx/cocoa/button.mm
@@ -159,17 +159,17 @@ void wxButtonCocoaImpl::GetLayoutInset(int &left , int &top , int &right, int &b
             case NSRegularControlSize:
                 left = right = 6;
                 top = 4;
-                bottom = 8;
+                bottom = 7;
                 break;
             case NSSmallControlSize:
                 left = right = 5;
                 top = 4;
-                bottom = 7;
+                bottom = 6;
                 break;
             case NSMiniControlSize:
                 left = right = 1;
                 top = 0;
-                bottom = 2;
+                bottom = 1;
                 break;
         }
     }
diff --git a/src/osx/cocoa/choice.mm b/src/osx/cocoa/choice.mm
index 0068d5d31d..52c12b7b6b 100644
--- a/src/osx/cocoa/choice.mm
+++ b/src/osx/cocoa/choice.mm
@@ -81,12 +81,12 @@ public:
             case NSRegularControlSize:
                 left = right = 3;
                 top = 2;
-                bottom = 4;
+                bottom = 3;
                 break;
             case NSSmallControlSize:
                 left = right = 3;
                 top = 1;
-                bottom = 4;
+                bottom = 3;
                 break;
             case NSMiniControlSize:
                 left = 1;
diff --git a/src/osx/cocoa/gauge.mm b/src/osx/cocoa/gauge.mm
index fe15e849a5..24f9bedc01 100644
--- a/src/osx/cocoa/gauge.mm
+++ b/src/osx/cocoa/gauge.mm
@@ -81,13 +81,13 @@ public :
             case NSRegularControlSize:
                 left = right = 2;
                 top = 0;
-                bottom = 4;
+                bottom = 3;
                 break;
             case NSMiniControlSize:
             case NSSmallControlSize:
                 left = right = 1;
                 top = 0;
-                bottom = 2;
+                bottom = 1;
                 break;
         }
     }