X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..37d92a964ae5801fed55b76b0d7ba2fa5645a353:/src/mac/button.cpp diff --git a/src/mac/button.cpp b/src/mac/button.cpp index 47f66425e2..c67c470acf 100644 --- a/src/mac/button.cpp +++ b/src/mac/button.cpp @@ -14,6 +14,7 @@ #endif #include "wx/button.h" +#include "wx/panel.h" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) @@ -53,31 +54,51 @@ void wxButton::SetDefault() btnOldDefault = panel->GetDefaultItem(); panel->SetDefaultItem(this); } - - if ( btnOldDefault && btnOldDefault->m_macControl ) - { - UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart , kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)0) ) ; - } - if ( m_macControl ) - { - UMASetControlData( m_macControl , kControlButtonPart , kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)1) ) ; - } + +#ifdef __UNIX__ + Boolean inData; + if ( btnOldDefault && btnOldDefault->m_macControl ) + { + inData = 0; + UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart , + kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ; + } + if ( m_macControl ) + { + inData = 1; + UMASetControlData( m_macControl , kControlButtonPart , + kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)(&inData) ) ; + } +#else + if ( btnOldDefault && btnOldDefault->m_macControl ) + { + UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart , + kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)0) ) ; + } + if ( m_macControl ) + { + UMASetControlData( m_macControl , kControlButtonPart , + kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)1) ) ; + } +#endif } wxSize wxButton::DoGetBestSize() const { + wxSize sz = GetDefaultSize() ; + int wBtn = m_label.Length() * 8 + 12 ; int hBtn = 20 ; - if ( wBtn < 80 ) - wBtn = 80 ; - - return wxSize(wBtn, hBtn); + if (wBtn > sz.x) sz.x = wBtn; + if (hBtn > sz.y) sz.y = hBtn; + + return sz ; } wxSize wxButton::GetDefaultSize() { - int wBtn = 80 /* + 2 * m_macHorizontalBorder */ ; + int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; int hBtn = 20 /* + 2 * m_macVerticalBorder */ ; return wxSize(wBtn, hBtn);