X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8c736e563cbf50bc5825c1a52878403ee48f513..04c79127659115628c316cc8f42e7132fd07bb0f:/src/mac/radiobox.cpp

diff --git a/src/mac/radiobox.cpp b/src/mac/radiobox.cpp
index c7bf4dce28..98e7172f9a 100644
--- a/src/mac/radiobox.cpp
+++ b/src/mac/radiobox.cpp
@@ -14,7 +14,8 @@
 //-------------------------------------------------------------------------------------
 
 #ifdef __GNUG__
-#pragma implementation "radiobox.h"
+  #pragma implementation "radioboxbase.h"
+  #pragma implementation "radiobox.h"
 #endif
 
 #include "wx/defs.h"
@@ -114,16 +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 = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+	m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
 	  	kControlGroupBoxTextTitleProc , (long) this ) ;
 	
-	MacPostControlCreate() ;
-
     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 ;
@@ -131,7 +130,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     }
 
 	SetSelection(0);
-	SetSize(pos.x,pos.y,size.x,size.y);
+	MacPostControlCreate() ;
 
   return TRUE;
 }
@@ -181,28 +180,6 @@ void wxRadioBox::Enable(int item, bool enable)
     	}
 }
 
-
-//-------------------------------------------------------------------------------------
-// 		¥ FindString
-//-------------------------------------------------------------------------------------
-// Finds a button matching the given string, returning the position if found 
-// or -1 if not found
-
-int wxRadioBox::FindString(const wxString& s) const
-{
-    int i;
-    wxRadioButton *current;
-    
-    current=m_radioButtonCycle;
-    for (i = 0; i < m_noItems; i++)
-    {
-        if (s == current->GetLabel())
-            return i;
-    	current=current->NextInCycle();
-    }
-    return -1;
-}
-
 //-------------------------------------------------------------------------------------
 // 		¥ GetLabel()
 //-------------------------------------------------------------------------------------
@@ -218,7 +195,7 @@ wxString wxRadioBox::GetLabel() const
 //-------------------------------------------------------------------------------------
 // Returns the label for the given button
 
-wxString wxRadioBox::GetLabel(int item) const
+wxString wxRadioBox::GetString(int item) const
 {
    	int i;
     wxRadioButton *current;
@@ -254,31 +231,6 @@ int wxRadioBox::GetSelection() const
     return i;
 }
 
-//-------------------------------------------------------------------------------------
-// 		¥ GetString
-//-------------------------------------------------------------------------------------
-// Find string for position
-
-wxString wxRadioBox::GetString(int item) const
-{
-
-    return GetLabel(item);
-}
-
-//-------------------------------------------------------------------------------------
-// 		¥ GetStringSelection
-//-------------------------------------------------------------------------------------
-// Returns the selected string
-
-wxString wxRadioBox::GetStringSelection () const
-{
-    int sel = GetSelection ();
-    if (sel > -1)
-        return this->GetString (sel);
-    else
-        return wxString("");
-}
-
 //-------------------------------------------------------------------------------------
 // 		¥ Number
 //-------------------------------------------------------------------------------------
@@ -302,7 +254,7 @@ void wxRadioBox::SetLabel(const wxString& label)
 //-------------------------------------------------------------------------------------
 // Sets the label of a given button
 
-void wxRadioBox::SetLabel(int item,const wxString& label)
+void wxRadioBox::SetString(int item,const wxString& label)
 {
    	int i;
     wxRadioButton *current;
@@ -341,24 +293,6 @@ void wxRadioBox::SetSelection(int item)
     
 }
 
-//-------------------------------------------------------------------------------------
-// 		¥ SetStringSelection
-//-------------------------------------------------------------------------------------
-// Sets a button by passing the desired string. This does not cause 
-// wxEVT_COMMAND_RADIOBOX_SELECTED event to get emitted
-
-bool wxRadioBox::SetStringSelection (const wxString& s)
-{
-    int sel = FindString (s);
-    if (sel > -1)
-    {
-        SetSelection (sel);
-        return TRUE;
-    }
-    else
-        return FALSE;
-}
-
 //-------------------------------------------------------------------------------------
 // 		¥ Show(bool)
 //-------------------------------------------------------------------------------------
@@ -479,15 +413,15 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 	maxHeight=-1;
 	for (i = 0 ; i < m_noItems; i++)
 		{
-		GetTextExtent(GetLabel(i), &eachWidth[i], &eachHeight[i]);
+		GetTextExtent(GetString(i), &eachWidth[i], &eachHeight[i]);
 		eachWidth[i] = (int)(eachWidth[i] + RADIO_SIZE);
 		eachHeight[i] = (int)((3*eachHeight[i])/2);
 		if (maxWidth<eachWidth[i]) maxWidth = eachWidth[i];
 		if (maxHeight<eachHeight[i]) maxHeight = eachHeight[i];
   		}
 
-	totHeight = GetNumVer() * (maxHeight + charHeight/2) + charHeight*3/2;
-	totWidth  = GetNumHor() * (maxWidth + charWidth) + charWidth;
+	totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight*3/2;
+	totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
 
     // only change our width/height if asked for
     if ( width == -1 )
@@ -545,12 +479,45 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 		}
 }
 
+wxSize wxRadioBox::DoGetBestSize() const
+{
+    int charWidth, charHeight;
+    int maxWidth, maxHeight;
+    int eachWidth, eachHeight;
+    int totWidth, totHeight;
+
+    wxFont font = GetParent()->GetFont();
+    GetTextExtent(wxString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
+                  &charWidth, &charHeight, NULL, NULL, &font);
+    charWidth /= 52;
+
+   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);
+        eachWidth  = (int)(eachWidth + RADIO_SIZE) ;
+        eachHeight = (int)((3 * eachHeight) / 2);
+        if (maxWidth < eachWidth)     maxWidth = eachWidth;
+        if (maxHeight < eachHeight)   maxHeight = eachHeight;
+    }
+
+    totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight * 3/2;
+    totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
+   return wxSize(totWidth, totHeight);
+}
 //-------------------------------------------------------------------------------------
 // 		¥ GetNumVer
 //-------------------------------------------------------------------------------------
 // return the number of buttons in the vertical direction
 
-int wxRadioBox::GetNumVer() const
+int wxRadioBox::GetRowCount() const
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {
@@ -567,7 +534,7 @@ int wxRadioBox::GetNumVer() const
 //-------------------------------------------------------------------------------------
 // return the number of buttons in the horizontal direction
 
-int wxRadioBox::GetNumHor() const
+int wxRadioBox::GetColumnCount() const
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {