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 cb0625b9d9 from master)
This commit is contained in:
sbrowne
2015-07-18 14:46:53 +02:00
committed by Vadim Zeitlin
parent 3379b053bd
commit 723e61a4b5
4 changed files with 8 additions and 7 deletions

View File

@@ -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).

View File

@@ -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;
}
}

View File

@@ -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;

View File

@@ -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;
}
}