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

fixed size patch applied

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-08-09 12:43:11 +00:00
parent 9156f27cba
commit 2a4c6734ad
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,24 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
} }
else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND) else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND)
{ {
#if TARGET_API_MAC_OSX
//Button height is static in Mac, can't be changed, so we need to force it here
if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE )
{
bounds.bottom = bounds.top + 20 ;
m_maxHeight = 20 ;
}
else if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
{
bounds.bottom = bounds.top + 17 ;
m_maxHeight = 17 ;
}
else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
{
bounds.bottom = bounds.top + 15 ;
m_maxHeight = 15 ;
}
#endif
verify_noerr ( CreatePushButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , m_peer->GetControlRefAddr() ) ); verify_noerr ( CreatePushButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , m_peer->GetControlRefAddr() ) );
} }
else else