reverting best size calculations

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index cc3685a17d5a5d3334f3df4604b7a6242d54ffbc..82e4e34c5f29f54f0d4dffe91a19694863dc01d0 100644 (file)
--- 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() * 10 + 12 + 2 * kMacOSXHorizontalBorder ;
+  int wBtn = m_label.Length() * 8 + 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 cc3685a17d5a5d3334f3df4604b7a6242d54ffbc..82e4e34c5f29f54f0d4dffe91a19694863dc01d0 100644 (file)
--- 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() * 10 + 12 + 2 * kMacOSXHorizontalBorder ;
+  int wBtn = m_label.Length() * 8 + 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 ae57f23ab07e48b09f2b08a4ec810d27902d15a5..49be26a16ccb9fd5cdc6e6332803eae751ad824a 100644 (file)
--- 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() * 10 + 12 ;
+                m_width = m_label.Length() * 8 + 12 ;
                 if ( m_width < 70 )
                   m_width = 70 ;
             }

diff --git a/src/mac/carbon/tglbtn.cpp b/src/mac/carbon/tglbtn.cpp
index 755e1d2f059f9c7f1d3e975d0b4fb8c821679a9e..aa7ee2bb3e95a5ce6365eb8b77a97d604aa66b64 100644 (file)
--- a/src/mac/carbon/tglbtn.cpp
+++ b/src/mac/carbon/tglbtn.cpp
@@ -84,7 +84,7 @@ wxSize wxToggleButton::DoGetBestSize() const
     int wBtn = 70 ; 
     int hBtn = 20 ;
 
-    int lBtn = m_label.Length() * 10 + 12 ;
+    int lBtn = m_label.Length() * 8 + 12 ;
     if (lBtn > wBtn) 
         wBtn = lBtn;
 

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index ae57f23ab07e48b09f2b08a4ec810d27902d15a5..49be26a16ccb9fd5cdc6e6332803eae751ad824a 100644 (file)
--- 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() * 10 + 12 ;
+                m_width = m_label.Length() * 8 + 12 ;
                 if ( m_width < 70 )
                   m_width = 70 ;
             }

diff --git a/src/mac/tglbtn.cpp b/src/mac/tglbtn.cpp
index 755e1d2f059f9c7f1d3e975d0b4fb8c821679a9e..aa7ee2bb3e95a5ce6365eb8b77a97d604aa66b64 100644 (file)
--- a/src/mac/tglbtn.cpp
+++ b/src/mac/tglbtn.cpp
@@ -84,7 +84,7 @@ wxSize wxToggleButton::DoGetBestSize() const
     int wBtn = 70 ; 
     int hBtn = 20 ;
 
-    int lBtn = m_label.Length() * 10 + 12 ;
+    int lBtn = m_label.Length() * 8 + 12 ;
     if (lBtn > wBtn) 
         wBtn = lBtn;