From eed9e4791274d68ea1fb0c556bf3199ecf88a7d9 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 28 Mar 2004 07:05:51 +0000 Subject: [PATCH] showing a bevel button for a multiline label (is not multline on the OS level, but shows a different button type) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/button.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index d11c858561..44e13791e2 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -39,8 +39,18 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, m_label = label ; Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , 1, + if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND) + { + m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , 1, kControlPushButtonProc , (long) this ) ; + } + else + { + ControlButtonContentInfo info ; + info.contentType = kControlNoContent ; + verify_noerr(CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds,CFSTR(""), + kControlBevelButtonLargeBevel , kControlBehaviorPushbutton , &info , 0 , 0 , 0 , (ControlRef*) &m_macControl ) ) ; + } wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ; MacPostControlCreate(pos,size) ; -- 2.50.0