A little clarification

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

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index d00911c8fd4347471c50f6d0b953ec8db95c24f7..fb47af661a7e1a9f38ec36f2e94cc5a74ca1c4e9 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -1,36 +1,53 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        radiobox.cpp
 // Purpose:     wxRadioBox
 /////////////////////////////////////////////////////////////////////////////
 // Name:        radiobox.cpp
 // Purpose:     wxRadioBox

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by: JS Lair (99/11/15) first implementation
 // Modified by: JS Lair (99/11/15) first implementation

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-//-------------------------------------------------------------------------------------
-//             headers
-//-------------------------------------------------------------------------------------
-

 #ifdef __GNUG__
 #ifdef __GNUG__

+#pragma implementation "radioboxbase.h"

 #pragma implementation "radiobox.h"
 #endif
 
 #pragma implementation "radiobox.h"
 #endif
 

+//-------------------------------------------------------------------------------------
+//         headers
+//-------------------------------------------------------------------------------------
+
+#include "wx/defs.h"
+

 #include "wx/radiobox.h"
 #include "wx/radiobox.h"

-#include <wx/mac/uma.h>
+#include "wx/radiobut.h"
+#include "wx/mac/uma.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 #endif
 
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 #endif
 

-#pragma mark -
-#pragma mark ### Constructors & destructor ###
-

 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------

-//             ¥ wxRadioBox()
+//         ¥ wxRadioBox()

 //-------------------------------------------------------------------------------------
 // Default constructor
 //-------------------------------------------------------------------------------------
 // Default constructor

+BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
+EVT_RADIOBUTTON( -1 , wxRadioBox::OnRadioButton )
+END_EVENT_TABLE()
+
+void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
+{
+    if ( outer.IsChecked() )
+    {
+        wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
+        int i = GetSelection() ;
+        event.SetInt( i );
+        event.SetString( GetString( i ) );
+        event.SetEventObject( this );
+        ProcessCommand(event);
+    }
+}

 
 wxRadioBox::wxRadioBox()
 {
 
 wxRadioBox::wxRadioBox()
 {


@@ -41,9 +58,9 @@ wxRadioBox::wxRadioBox()
 }
 
 //-------------------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------------------

-//             ¥ wxRadioBox(wxWindow*, wxWindowID, const wxString&, const wxPoint&, 
-//                                             const wxSize&, int, const wxString[], int, long, 
-//                                             const wxValidator&, const wxString&)
+//         ¥ wxRadioBox(wxWindow*, wxWindowID, const wxString&, const wxPoint&, 
+//                        const wxSize&, int, const wxString[], int, long, 
+//                        const wxValidator&, const wxString&)

 //-------------------------------------------------------------------------------------
 // Contructor, creating and showing a radiobox
 //
 //-------------------------------------------------------------------------------------
 // Contructor, creating and showing a radiobox
 //


@@ -51,137 +68,128 @@ wxRadioBox::wxRadioBox()
 //
 
 //-------------------------------------------------------------------------------------
 //
 
 //-------------------------------------------------------------------------------------

-//             ¥ ~wxRadioBox
+//         ¥ ~wxRadioBox

 //-------------------------------------------------------------------------------------
 // Destructor, destroying the radiobox item
 
 wxRadioBox::~wxRadioBox()
 {
 //-------------------------------------------------------------------------------------
 // Destructor, destroying the radiobox item
 
 wxRadioBox::~wxRadioBox()
 {

-       wxRadioButton *next,*current;
-       
+    m_isBeingDeleted = TRUE;
+
+    wxRadioButton *next,*current;
+    

     current=m_radioButtonCycle->NextInCycle();
     next=current->NextInCycle();
     while (current!=m_radioButtonCycle) {
     current=m_radioButtonCycle->NextInCycle();
     next=current->NextInCycle();
     while (current!=m_radioButtonCycle) {

-       delete current;
-       current=next;
-       next=current->NextInCycle();
-       }
+        delete current;
+        current=next;
+        next=current->NextInCycle();
+    }

     delete current;    
 }
 
 //-------------------------------------------------------------------------------------
     delete current;    
 }
 
 //-------------------------------------------------------------------------------------

-//             ¥ Create
+//         ¥ Create

 //-------------------------------------------------------------------------------------
 // Create the radiobox for two-step construction
 
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 //-------------------------------------------------------------------------------------
 // Create the radiobox for two-step construction
 
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,

-             const wxPoint& pos, const wxSize& size,
-             int n, const wxString choices[],
-             int majorDim, long style,
-             const wxValidator& val, const wxString& name)
+                        const wxPoint& pos, const wxSize& size,
+                        int n, const wxString choices[],
+                        int majorDim, long style,
+                        const wxValidator& val, const wxString& name)

 {
 {

+    if ( !wxControl::Create(parent, id, pos, size, style, val, name) )
+        return false;
+

     int i;
     
     m_noItems = n;
     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
     int i;
     
     m_noItems = n;
     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;

-
+    

     if (majorDim==0)
         m_majorDim = n ;
     else
         m_majorDim = majorDim ;
     if (majorDim==0)
         m_majorDim = n ;
     else
         m_majorDim = majorDim ;

-
-
-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  label , pos , size ,style, *((wxValidator*)NULL) , name , &bounds , title ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
-               kControlGroupBoxTextTitleProc , (long) this ) ;
-       
-       MacPostControlCreate() ;
-
+    
+    
+    Rect bounds ;
+    Str255 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++)
     {
     for (i = 0; i < n; i++)
     {

-        wxRadioButton *radBtn = new wxRadioButton(this, NewControlId(),choices[i],wxPoint(5,20*i+10));
-        m_radioButtonCycle=radBtn->AddInCycle(m_radioButtonCycle);
+        wxRadioButton *radBtn = new wxRadioButton
+                                    (
+                                        this,
+                                        wxID_ANY,
+                                        wxStripMenuCodes(choices[i]),
+                                        wxPoint(5,20*i+10),
+                                        wxDefaultSize,
+                                        i == 0 ? wxRB_GROUP : 0
+                                    );
+        if ( i == 0 )
+            m_radioButtonCycle = radBtn ;
+        //        m_radioButtonCycle=radBtn->AddInCycle(m_radioButtonCycle);

     }
     }

-
-       SetSelection(0);
-       SetSize(pos.x,pos.y,size.x,size.y);
-
-  return TRUE;
+    
+    SetSelection(0);
+    MacPostControlCreate() ;
+    
+    return TRUE;

 }
 
 
 }
 
 

-#pragma mark -
-#pragma mark ### Specific functions (reference v2) ###
-

 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------

-//             ¥ Enable(bool)
+//         ¥ Enable(bool)

 //-------------------------------------------------------------------------------------
 // Enables or disables the entire radiobox
 
 //-------------------------------------------------------------------------------------
 // Enables or disables the entire radiobox
 

-void wxRadioBox::Enable(bool enable)
+bool wxRadioBox::Enable(bool enable)

 {
 {

-       int i;
+    int i;

     wxRadioButton *current;
     
     wxRadioButton *current;
     

-    wxControl::Enable(enable);
-
-    current=m_radioButtonCycle;
-       for (i=0;i<m_noItems;i++) {
-       current->Enable(enable);
-       current=current->NextInCycle();
-       }
+    if (!wxControl::Enable(enable))
+        return false;
+    
+    current = m_radioButtonCycle;
+    for (i = 0; i < m_noItems; i++) {
+        current->Enable(enable);
+        current = current->NextInCycle();
+    }
+    return true;

 }
 
 //-------------------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------------------

-//             ¥ Enable(int, bool)
+//         ¥ Enable(int, bool)

 //-------------------------------------------------------------------------------------
 // Enables or disables an given button
 
 void wxRadioBox::Enable(int item, bool enable)
 {
 //-------------------------------------------------------------------------------------
 // Enables or disables an given button
 
 void wxRadioBox::Enable(int item, bool enable)
 {

-       int i;
+    int i;

     wxRadioButton *current;
     
     if ((item < 0) || (item >= m_noItems))
         return;
     wxRadioButton *current;
     
     if ((item < 0) || (item >= m_noItems))
         return;

-    i=0;
-    current=m_radioButtonCycle;
-    while (i!=item) {
-       i++;
-       current=current->NextInCycle();
-       }
-    return current->Enable(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();
+    i = 0;
+    current = m_radioButtonCycle;
+    while (i != item) {
+        i++;
+        current = current->NextInCycle();

     }
     }

-    return -1;
+    current->Enable(enable);

 }
 
 //-------------------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------------------

-//             ¥ GetLabel()
+//         ¥ GetLabel()

 //-------------------------------------------------------------------------------------
 // Returns the radiobox label
 
 //-------------------------------------------------------------------------------------
 // Returns the radiobox label
 


@@ -191,28 +199,29 @@ wxString wxRadioBox::GetLabel() const
 }
 
 //-------------------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------------------

-//             ¥ GetLabel(int)
+//         ¥ GetLabel(int)

 //-------------------------------------------------------------------------------------
 // Returns the label for the given button
 
 //-------------------------------------------------------------------------------------
 // Returns the label for the given button
 

-wxString wxRadioBox::GetLabel(int item) const
+wxString wxRadioBox::GetString(int item) const

 {
 {

-       int i;
+    int i;

     wxRadioButton *current;
     
     if ((item < 0) || (item >= m_noItems))
     wxRadioButton *current;
     
     if ((item < 0) || (item >= m_noItems))

-        return wxString("");
-    i=0;
-    current=m_radioButtonCycle;
-    while (i!=item) {
-       i++;
-       current=current->NextInCycle();
-       }
+        return wxEmptyString;
+    
+    i = 0;
+    current = m_radioButtonCycle;
+    while (i != item) {
+        i++;
+        current = current->NextInCycle();
+    }

     return current->GetLabel();
 }
 
 //-------------------------------------------------------------------------------------
     return current->GetLabel();
 }
 
 //-------------------------------------------------------------------------------------

-//             ¥ GetSelection
+//         ¥ GetSelection

 //-------------------------------------------------------------------------------------
 // Returns the zero-based position of the selected button
 
 //-------------------------------------------------------------------------------------
 // Returns the zero-based position of the selected button
 


@@ -224,40 +233,15 @@ int wxRadioBox::GetSelection() const
     i=0;
     current=m_radioButtonCycle;
     while (!current->GetValue()) {
     i=0;
     current=m_radioButtonCycle;
     while (!current->GetValue()) {

-       i++;
-       current=current->NextInCycle();
-       }
-
+        i++;
+        current=current->NextInCycle();
+    }
+    

     return i;
 }
 
 //-------------------------------------------------------------------------------------
     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
+//         ¥ Number

 //-------------------------------------------------------------------------------------
 // Returns the number of buttons in the radiobox
 //
 //-------------------------------------------------------------------------------------
 // Returns the number of buttons in the radiobox
 //


@@ -265,7 +249,7 @@ wxString wxRadioBox::GetStringSelection () const
 //
 
 //-------------------------------------------------------------------------------------
 //
 
 //-------------------------------------------------------------------------------------

-//             ¥ SetLabel(const wxString&)
+//         ¥ SetLabel(const wxString&)

 //-------------------------------------------------------------------------------------
 // Sets the radiobox label
 
 //-------------------------------------------------------------------------------------
 // Sets the radiobox label
 


@@ -275,28 +259,28 @@ void wxRadioBox::SetLabel(const wxString& label)
 }
 
 //-------------------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------------------

-//             ¥ SetLabel(int, const wxString&)
+//         ¥ SetLabel(int, const wxString&)

 //-------------------------------------------------------------------------------------
 // Sets the label of a given button
 
 //-------------------------------------------------------------------------------------
 // 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;
+       int i;

     wxRadioButton *current;
     
     if ((item < 0) || (item >= m_noItems))
         return;
     wxRadioButton *current;
     
     if ((item < 0) || (item >= m_noItems))
         return;

-       i=0;
+    i=0;

     current=m_radioButtonCycle;
     while (i!=item) {
     current=m_radioButtonCycle;
     while (i!=item) {

-       i++;
-       current=current->NextInCycle();
-       }
+        i++;
+        current=current->NextInCycle();
+    }

     return current->SetLabel(label);
 }
 
 //-------------------------------------------------------------------------------------
     return current->SetLabel(label);
 }
 
 //-------------------------------------------------------------------------------------

-//             ¥ SetSelection
+//         ¥ SetSelection

 //-------------------------------------------------------------------------------------
 // Sets a button by passing the desired position. This does not cause 
 // wxEVT_COMMAND_RADIOBOX_SELECTED event to get emitted
 //-------------------------------------------------------------------------------------
 // Sets a button by passing the desired position. This does not cause 
 // wxEVT_COMMAND_RADIOBOX_SELECTED event to get emitted


@@ -311,33 +295,15 @@ void wxRadioBox::SetSelection(int item)
     i=0;
     current=m_radioButtonCycle;
     while (i!=item) {
     i=0;
     current=m_radioButtonCycle;
     while (i!=item) {

-       i++;
-       current=current->NextInCycle();
-       }
+        i++;
+        current=current->NextInCycle();
+    }

     current->SetValue(true);
     
 }
 
 //-------------------------------------------------------------------------------------
     current->SetValue(true);
     
 }
 
 //-------------------------------------------------------------------------------------

-//             ¥ 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)
+//         ¥ Show(bool)

 //-------------------------------------------------------------------------------------
 // Shows or hides the entire radiobox 
 
 //-------------------------------------------------------------------------------------
 // Shows or hides the entire radiobox 
 


@@ -347,23 +313,23 @@ bool wxRadioBox::Show(bool show)
     wxRadioButton *current;
     
     wxControl::Show(show);
     wxRadioButton *current;
     
     wxControl::Show(show);

-
+    

     current=m_radioButtonCycle;
     current=m_radioButtonCycle;

-       for (i=0;i<m_noItems;i++) {
-       current->Show(show);
-       current=current->NextInCycle();
-       }
+       for (i=0;i<m_noItems;i++) {
+        current->Show(show);
+        current=current->NextInCycle();
+    }

     return true;
 }
 
 //-------------------------------------------------------------------------------------
     return true;
 }
 
 //-------------------------------------------------------------------------------------

-//             ¥ Show(int, bool)
+//         ¥ Show(int, bool)

 //-------------------------------------------------------------------------------------
 // Shows or hides the given button 
 
 void wxRadioBox::Show(int item, bool show)
 {
 //-------------------------------------------------------------------------------------
 // Shows or hides the given button 
 
 void wxRadioBox::Show(int item, bool show)
 {

-       int i;
+       int i;

     wxRadioButton *current;
     
     if ((item < 0) || (item >= m_noItems))
     wxRadioButton *current;
     
     if ((item < 0) || (item >= m_noItems))


@@ -371,17 +337,14 @@ void wxRadioBox::Show(int item, bool show)
     i=0;
     current=m_radioButtonCycle;
     while (i!=item) {
     i=0;
     current=m_radioButtonCycle;
     while (i!=item) {

-       i++;
-       current=current->NextInCycle();
-       }
+        i++;
+        current=current->NextInCycle();
+    }

     current->Show(show);
 }
 
     current->Show(show);
 }
 

-#pragma mark -
-#pragma mark ### Other external functions ###
-

 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------

-//             ¥ Command
+//         ¥ Command

 //-------------------------------------------------------------------------------------
 // Simulates the effect of the user issuing a command to the item
 
 //-------------------------------------------------------------------------------------
 // Simulates the effect of the user issuing a command to the item
 


@@ -392,7 +355,7 @@ void wxRadioBox::Command (wxCommandEvent & event)
 }
 
 //-------------------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------------------

-//             ¥ SetFocus
+//         ¥ SetFocus

 //-------------------------------------------------------------------------------------
 // Sets the selected button to receive keyboard input
 
 //-------------------------------------------------------------------------------------
 // Sets the selected button to receive keyboard input
 


@@ -404,18 +367,15 @@ void wxRadioBox::SetFocus()
     i=0;
     current=m_radioButtonCycle;
     while (!current->GetValue()) {
     i=0;
     current=m_radioButtonCycle;
     while (!current->GetValue()) {

-       i++;
-       current=current->NextInCycle();
-       }
-       current->SetFocus();
+        i++;
+        current=current->NextInCycle();
+    }
+    current->SetFocus();

 }
 
 
 }
 
 

-#pragma mark -
-#pragma mark ### Internal functions ###
-

 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------

-//             ¥ DoSetSize
+//         ¥ DoSetSize

 //-------------------------------------------------------------------------------------
 // Simulates the effect of the user issuing a command to the item
 
 //-------------------------------------------------------------------------------------
 // Simulates the effect of the user issuing a command to the item
 


@@ -423,92 +383,146 @@ void wxRadioBox::SetFocus()
 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {

-       int i;
-       wxRadioButton *current;
-
-// define the position
-
-       int x_current, y_current;
-       int x_offset,y_offset;
-
-       x_offset = x;
-       y_offset = y;
-       GetPosition(&x_current, &y_current);
-       if ((x == -1) || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-               x_offset = x_current;
-       if ((y == -1) || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-               y_offset = y_current;
-
-// define size
-
-       int charWidth,charHeight;
-       int maxWidth,maxHeight;
-       int eachWidth[128],eachHeight[128];
+    int i;
+    wxRadioButton *current;
+    
+    // define the position
+    
+    int x_current, y_current;
+    int x_offset,y_offset;
+    int widthOld, heightOld;
+    GetSize(&widthOld, &heightOld);
+    
+    x_offset = x;
+    y_offset = y;
+    GetPosition(&x_current, &y_current);
+    if ((x == -1) && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        x_offset = x_current;
+    if ((y == -1)&& !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        y_offset = y_current;
+    
+    // define size
+    
+    int charWidth,charHeight;
+    int maxWidth,maxHeight;
+    int eachWidth[128],eachHeight[128];

     int totWidth,totHeight;
     int totWidth,totHeight;

-
-       SetFont(GetParent()->GetFont());
-       GetTextExtent(wxString("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), &charWidth, &charHeight);
-       charWidth/=52;
-
-       maxWidth=-1;
-       maxHeight=-1;
-       for (i = 0 ; i < m_noItems; i++)
-               {
-               GetTextExtent(GetLabel(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;
-
-       wxControl::DoSetSize(x_offset,y_offset,totWidth,totHeight);
-
-// arrange radiobuttons
-
-       int x_start,y_start;
-       
-       
-       x_start = charWidth;
-       y_start = charHeight*3/2;
-       x_offset = x_start;
-       y_offset = y_start;
-       
-       current=m_radioButtonCycle;  
-       for ( i = 0 ; i < m_noItems; i++)
-               {
-               if (i&&((i%m_majorDim)==0)) // not to do for the zero button!
-               {
-               if (m_windowStyle & wxRA_VERTICAL)
-                       {
-                           x_offset += maxWidth + charWidth;
-                       y_offset = y_start;
-                               }
-               else
-                       {
-                               x_offset = x_start;
-                       y_offset += maxHeight + charHeight/2;
-                               }
-                       }
-
-               current->SetSize(x_offset,y_offset,eachWidth[i],eachHeight[i]);
-               current=current->NextInCycle();
-               
-               if (m_windowStyle & wxRA_SPECIFY_ROWS)
-                       y_offset += maxHeight + charHeight/2;
-               else
-                       x_offset += maxWidth + charWidth;
-               }
+    
+    SetFont(GetParent()->GetFont());
+    GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), &charWidth, &charHeight);
+    charWidth/=52;
+    
+    maxWidth=-1;
+    maxHeight=-1;
+    for (i = 0 ; i < m_noItems; 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 = GetRowCount() * (maxHeight + charHeight/2) + charHeight ;
+    totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
+    
+    // only change our width/height if asked for
+    if ( width == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+            width = totWidth ;
+        else
+            width = widthOld;
+    }
+    
+    if ( height == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+            height = totHeight ;
+        else
+            height = heightOld;
+    }
+    
+    wxControl::DoSetSize(x_offset,y_offset,width,height,wxSIZE_AUTO);
+    
+    // arrange radiobuttons
+    
+    int x_start,y_start;
+    
+    
+    x_start = charWidth;
+    y_start = 15 ;
+    x_offset = x_start;
+    y_offset = y_start;
+    
+    current=m_radioButtonCycle;  
+    for ( i = 0 ; i < m_noItems; i++)
+    {
+        if (i&&((i%m_majorDim)==0)) // not to do for the zero button!
+        {
+            if (m_windowStyle & wxRA_VERTICAL)
+            {
+                x_offset += maxWidth + charWidth;
+                y_offset = y_start;
+            }
+            else
+            {
+                x_offset = x_start;
+                y_offset += maxHeight ; /*+ charHeight/2;*/
+            }
+        }
+        
+        current->SetSize(x_offset,y_offset,eachWidth[i],eachHeight[i]);
+        current=current->NextInCycle();
+        
+        if (m_windowStyle & wxRA_SPECIFY_ROWS)
+            y_offset += maxHeight ; /*+ charHeight/2;*/
+        else
+            x_offset += maxWidth + charWidth;
+    }

 }
 
 }
 

+wxSize wxRadioBox::DoGetBestSize() const
+{
+    int charWidth, charHeight;
+    int maxWidth, maxHeight;
+    int eachWidth, eachHeight;
+    int totWidth, totHeight;
+    
+    wxFont font = GetParent()->GetFont();
+    GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
+        &charWidth, &charHeight, NULL, NULL, &font);
+    charWidth /= 52;
+    
+    maxWidth = -1;
+    maxHeight = -1;
+    
+    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 ;
+    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);
+}

 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------

-//             ¥ GetNumVer
+//         ¥ GetNumVer

 //-------------------------------------------------------------------------------------
 // return the number of buttons in the vertical direction
 
 //-------------------------------------------------------------------------------------
 // return the number of buttons in the vertical direction
 

-int wxRadioBox::GetNumVer() const
+int wxRadioBox::GetRowCount() const

 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {


@@ -521,11 +535,11 @@ int wxRadioBox::GetNumVer() const
 }
 
 //-------------------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------------------

-//             ¥ GetNumHor
+//         ¥ GetNumHor

 //-------------------------------------------------------------------------------------
 // return the number of buttons in the horizontal direction
 
 //-------------------------------------------------------------------------------------
 // return the number of buttons in the horizontal direction
 

-int wxRadioBox::GetNumHor() const
+int wxRadioBox::GetColumnCount() const

 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {