From ae45f98300faa8347f0fc7869f115f8704136612 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Sun, 24 Feb 2002 19:32:11 +0000 Subject: [PATCH] take title of radiobox into account to calculate best size (SF #509963) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/radiobox.cpp | 6 ++++++ src/mac/radiobox.cpp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp index 1ec40d88cf..2d002e7852 100644 --- a/src/mac/carbon/radiobox.cpp +++ b/src/mac/carbon/radiobox.cpp @@ -493,6 +493,12 @@ wxSize wxRadioBox::DoGetBestSize() const maxWidth = -1; maxHeight = -1; + + // handle radio box title as well + GetTextExtent(GetTitle(), &eachWidth, NULL); + eachWidth = (int)(eachWidth + RADIO_SIZE); + if (maxWidth < eachWidth) maxWidth = eachWidth; + for (int i = 0 ; i < m_noItems; i++) { GetTextExtent(GetString(i), &eachWidth, &eachHeight); diff --git a/src/mac/radiobox.cpp b/src/mac/radiobox.cpp index 1ec40d88cf..2d002e7852 100644 --- a/src/mac/radiobox.cpp +++ b/src/mac/radiobox.cpp @@ -493,6 +493,12 @@ wxSize wxRadioBox::DoGetBestSize() const maxWidth = -1; maxHeight = -1; + + // handle radio box title as well + GetTextExtent(GetTitle(), &eachWidth, NULL); + eachWidth = (int)(eachWidth + RADIO_SIZE); + if (maxWidth < eachWidth) maxWidth = eachWidth; + for (int i = 0 ; i < m_noItems; i++) { GetTextExtent(GetString(i), &eachWidth, &eachHeight); -- 2.50.0