From 407f0db0504c39e022c063d64c03e2ff2117d5b3 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 21 Feb 2004 16:35:24 +0000 Subject: [PATCH] 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 --- src/mac/button.cpp | 2 +- src/mac/carbon/button.cpp | 2 +- src/mac/carbon/control.cpp | 2 +- src/mac/control.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mac/button.cpp b/src/mac/button.cpp index 82e4e34c5f..cc3685a17d 100644 --- a/src/mac/button.cpp +++ b/src/mac/button.cpp @@ -87,7 +87,7 @@ wxSize wxButton::DoGetBestSize() const { 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; diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index 82e4e34c5f..cc3685a17d 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -87,7 +87,7 @@ wxSize wxButton::DoGetBestSize() const { 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; diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp index 49be26a16c..ae57f23ab0 100644 --- a/src/mac/carbon/control.cpp +++ b/src/mac/carbon/control.cpp @@ -433,7 +433,7 @@ void wxControl::MacAdjustControlRect() { if ( IsKindOf( CLASSINFO( wxButton ) ) ) { - m_width = m_label.Length() * 8 + 12 ; + m_width = m_label.Length() * 10 + 12 ; if ( m_width < 70 ) m_width = 70 ; } diff --git a/src/mac/control.cpp b/src/mac/control.cpp index 49be26a16c..ae57f23ab0 100644 --- a/src/mac/control.cpp +++ b/src/mac/control.cpp @@ -433,7 +433,7 @@ void wxControl::MacAdjustControlRect() { if ( IsKindOf( CLASSINFO( wxButton ) ) ) { - m_width = m_label.Length() * 8 + 12 ; + m_width = m_label.Length() * 10 + 12 ; if ( m_width < 70 ) m_width = 70 ; } -- 2.45.2