using Large System font for Buttons needs more space
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -87,7 +87,7 @@ wxSize wxButton::DoGetBestSize() const
|
|||||||
{
|
{
|
||||||
wxSize sz = GetDefaultSize() ;
|
wxSize sz = GetDefaultSize() ;
|
||||||
|
|
||||||
int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
|
int wBtn = m_label.Length() * 10 + 12 + 2 * kMacOSXHorizontalBorder ;
|
||||||
|
|
||||||
if (wBtn > sz.x) sz.x = wBtn;
|
if (wBtn > sz.x) sz.x = wBtn;
|
||||||
|
|
||||||
|
@@ -87,7 +87,7 @@ wxSize wxButton::DoGetBestSize() const
|
|||||||
{
|
{
|
||||||
wxSize sz = GetDefaultSize() ;
|
wxSize sz = GetDefaultSize() ;
|
||||||
|
|
||||||
int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
|
int wBtn = m_label.Length() * 10 + 12 + 2 * kMacOSXHorizontalBorder ;
|
||||||
|
|
||||||
if (wBtn > sz.x) sz.x = wBtn;
|
if (wBtn > sz.x) sz.x = wBtn;
|
||||||
|
|
||||||
|
@@ -433,7 +433,7 @@ void wxControl::MacAdjustControlRect()
|
|||||||
{
|
{
|
||||||
if ( IsKindOf( CLASSINFO( wxButton ) ) )
|
if ( IsKindOf( CLASSINFO( wxButton ) ) )
|
||||||
{
|
{
|
||||||
m_width = m_label.Length() * 8 + 12 ;
|
m_width = m_label.Length() * 10 + 12 ;
|
||||||
if ( m_width < 70 )
|
if ( m_width < 70 )
|
||||||
m_width = 70 ;
|
m_width = 70 ;
|
||||||
}
|
}
|
||||||
|
@@ -433,7 +433,7 @@ void wxControl::MacAdjustControlRect()
|
|||||||
{
|
{
|
||||||
if ( IsKindOf( CLASSINFO( wxButton ) ) )
|
if ( IsKindOf( CLASSINFO( wxButton ) ) )
|
||||||
{
|
{
|
||||||
m_width = m_label.Length() * 8 + 12 ;
|
m_width = m_label.Length() * 10 + 12 ;
|
||||||
if ( m_width < 70 )
|
if ( m_width < 70 )
|
||||||
m_width = 70 ;
|
m_width = 70 ;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user