From c5bdc14fd63b9be2b0864682045d9c6debdb189f Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 13 Aug 2002 09:51:13 +0000 Subject: [PATCH] corrected BestSize algorithm git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/radiobox.cpp | 12 +++++++----- src/mac/radiobox.cpp | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp index 98e7172f9a..cc3ad3ba13 100644 --- a/src/mac/carbon/radiobox.cpp +++ b/src/mac/carbon/radiobox.cpp @@ -494,11 +494,6 @@ 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); @@ -510,6 +505,13 @@ wxSize wxRadioBox::DoGetBestSize() const totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight * 3/2; totWidth = GetColumnCount() * (maxWidth + charWidth) + charWidth; + + // handle radio box title as well + GetTextExtent(GetTitle(), &eachWidth, NULL); + eachWidth = (int)(eachWidth + RADIO_SIZE) + 3 * charWidth ; + if (totWidth < eachWidth) + totWidth = eachWidth; + return wxSize(totWidth, totHeight); } //------------------------------------------------------------------------------------- diff --git a/src/mac/radiobox.cpp b/src/mac/radiobox.cpp index 98e7172f9a..cc3ad3ba13 100644 --- a/src/mac/radiobox.cpp +++ b/src/mac/radiobox.cpp @@ -494,11 +494,6 @@ 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); @@ -510,6 +505,13 @@ wxSize wxRadioBox::DoGetBestSize() const totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight * 3/2; totWidth = GetColumnCount() * (maxWidth + charWidth) + charWidth; + + // handle radio box title as well + GetTextExtent(GetTitle(), &eachWidth, NULL); + eachWidth = (int)(eachWidth + RADIO_SIZE) + 3 * charWidth ; + if (totWidth < eachWidth) + totWidth = eachWidth; + return wxSize(totWidth, totHeight); } //------------------------------------------------------------------------------------- -- 2.45.2