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

account for the label size in wxDisclosureTriangle under Carbon

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-11 16:00:01 +00:00
parent 522c340481
commit 4644cfba41
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osx/button_osx.cpp
View File

@@ -44,7 +44,7 @@ bool wxButton::Create(wxWindow *parent,
return false; return false;
m_labelOrig = m_label = label ; m_labelOrig = m_label = label ;
m_peer = wxWidgetImpl::CreateButton( this, parent, id, label, pos, size, style, GetExtraStyle() ); m_peer = wxWidgetImpl::CreateButton( this, parent, id, label, pos, size, style, GetExtraStyle() );
MacPostControlCreate( pos, size ); MacPostControlCreate( pos, size );
@@ -95,9 +95,9 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin
m_peer = wxWidgetImpl::CreateDisclosureTriangle(this, parent, id, label, pos, size, style, GetExtraStyle() ); m_peer = wxWidgetImpl::CreateDisclosureTriangle(this, parent, id, label, pos, size, style, GetExtraStyle() );
MacPostControlCreate( pos, size ); MacPostControlCreate( pos, size );
// passing the text in the param doesn't seem to work, so lets do if again // passing the text in the param doesn't seem to work, so lets do it again
SetLabel( label ); SetLabel( label );
return true; return true;
} }
@@ -123,6 +123,14 @@ bool wxDisclosureTriangle::OSXHandleClicked( double WXUNUSED(timestampsec) )
wxSize wxDisclosureTriangle::DoGetBestSize() const wxSize wxDisclosureTriangle::DoGetBestSize() const
{ {
return wxWindow::DoGetBestSize(); wxSize size = wxWindow::DoGetBestSize();
// under Carbon the base class GetBestSize() implementation doesn't seem to
// take the label into account at all, correct for it here
#if wxOSX_USE_CARBON
size.x += GetTextExtent(GetLabel()).x;
#endif // wxOSX_USE_CARBON
return size;
} }