X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..50c76ce1f7c2d9f121ff1015b0abae99dcb2a31a:/src/mac/button.cpp diff --git a/src/mac/button.cpp b/src/mac/button.cpp index 47f66425e2..72e1af8e5d 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,15 +54,33 @@ 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