From cb0625b9d9b96b751eb748463f3aa60697bbf5ce Mon Sep 17 00:00:00 2001 From: sbrowne 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. --- src/osx/cocoa/button.mm | 6 +++--- src/osx/cocoa/choice.mm | 4 ++-- src/osx/cocoa/gauge.mm | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm index 4da2de063b..0d28e306cc 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 2ab2784013..26dccc9d4b 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 0958d89e71..c28ddd08f0 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; } }