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

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index 1ec40d88cfcac99e94de3d9b203e0bcc01f66e16..2d002e7852a9fd24056484ad285b8559a3422cd9 100644 (file)
--- 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 1ec40d88cfcac99e94de3d9b203e0bcc01f66e16..2d002e7852a9fd24056484ad285b8559a3422cd9 100644 (file)
--- 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);