Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

best size handling fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-06-25 11:33:39 +00:00
parent 2d1760d30f
commit 6d325d81bc
1 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/mac/carbon/button.cpp
View File

@@ -77,31 +77,44 @@ void wxButton::SetDefault()
wxSize wxButton::DoGetBestSize() const
{
wxSize sz = GetDefaultSize() ;
wxSize sz = GetDefaultSize() ;
int charspace = 8 ;
if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
{
sz.y = 20 ;
charspace = 10 ;
}
else if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
{
sz.y = 17 ;
charspace = 8 ;
}
else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
{
sz.y = 15 ;
charspace = 8 ;
}
int charspace = 8 ;
if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
{
sz.y = 20 ;
charspace = 10 ;
}
else if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
{
sz.y = 17 ;
charspace = 8 ;
}
else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
{
sz.y = 15 ;
charspace = 8 ;
}
Rect bestsize = { 0 , 0 , 0 , 0 } ;
short baselineoffset ;
::GetBestControlRect( *m_peer , &bestsize , &baselineoffset ) ;
int wBtn = m_label.Length() * charspace + 12 ;
if (wBtn > sz.x || ( GetWindowStyle() & wxBU_EXACTFIT) )
sz.x = wBtn;
return sz ;
int wBtn = 0 ;
if ( EmptyRect( &bestsize ) )
{
int wBtn = m_label.Length() * charspace + 12 ;
}
else
{
sz.x = bestsize.right - bestsize.left ;
sz.y = bestsize.bottom - bestsize.top ;
}
if (wBtn > sz.x || ( GetWindowStyle() & wxBU_EXACTFIT) )
sz.x = wBtn;
return sz ;
}
wxSize wxButton::GetDefaultSize()