added option for getting visible region w/o children clipped

[wxWidgets.git] / src / mac / carbon / radiobox.cpp

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index 1ec40d88cfcac99e94de3d9b203e0bcc01f66e16..98e7172f9a518b185b88027dca4f94d16d8a790f 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -115,14 +115,14 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        Rect bounds ;
        Str255 title ;
        
-       MacPreControlCreate( parent , id ,  label , pos , size ,style, val , name , &bounds , title ) ;
+       MacPreControlCreate( parent , id ,  wxStripMenuCodes(label) , pos , size ,style, val , name , &bounds , title ) ;
 
        m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
                kControlGroupBoxTextTitleProc , (long) this ) ;
        
     for (i = 0; i < n; i++)
     {
-        wxRadioButton *radBtn = new wxRadioButton(this, NewControlId(),choices[i],wxPoint(5,20*i+10),
+        wxRadioButton *radBtn = new wxRadioButton(this, NewControlId(), wxStripMenuCodes(choices[i]),wxPoint(5,20*i+10),
           wxDefaultSize , i == 0 ? wxRB_GROUP : 0 ) ;
         if ( i == 0 )
           m_radioButtonCycle = radBtn ;
@@ -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);