use wx-style header and commets; fix indentation to be 4 spaces; move Doxygen comment...

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

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index be78021cf1987aea1c3dc12f36c75d151bad4f69..69ce082c1b620fe5dcbfdd41c6f64b8e074aceae 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -1,53 +1,43 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobox.cpp
+// Name:        src/mac/carbon/radiobox.cpp

 // Purpose:     wxRadioBox
 // Author:      Stefan Csomor
 // Modified by: JS Lair (99/11/15) first implementation
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxRadioBox
 // Author:      Stefan Csomor
 // Modified by: JS Lair (99/11/15) first implementation
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "radioboxbase.h"
-#pragma implementation "radiobox.h"
-#endif
-
-//-------------------------------------------------------------------------------------
-//         headers
-//-------------------------------------------------------------------------------------
-

 #include "wx/wxprec.h"
 
 #if wxUSE_RADIOBOX
 
 #include "wx/wxprec.h"
 
 #if wxUSE_RADIOBOX
 

-#include "wx/arrstr.h"
-

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

-#include "wx/radiobut.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/radiobut.h"
+    #include "wx/arrstr.h"
+#endif
+

 #include "wx/mac/uma.h"
 
 #include "wx/mac/uma.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)

-#endif

 
 

-//-------------------------------------------------------------------------------------
-//         ¥ wxRadioBox()
-//-------------------------------------------------------------------------------------
-// Default constructor
+

 BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
 BEGIN_EVENT_TABLE(wxRadioBox, wxControl)

-EVT_RADIOBUTTON( -1 , wxRadioBox::OnRadioButton )
+    EVT_RADIOBUTTON( wxID_ANY , wxRadioBox::OnRadioButton )

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

+

 void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
 {
     if ( outer.IsChecked() )
     {
 void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
 {
     if ( outer.IsChecked() )
     {

-        wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
+        wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId );

         int i = GetSelection() ;
         int i = GetSelection() ;

-        event.SetInt( i );
-        event.SetString( GetString( i ) );
+        event.SetInt(i);
+        event.SetString(GetString(i));

         event.SetEventObject( this );
         ProcessCommand(event);
     }
         event.SetEventObject( this );
         ProcessCommand(event);
     }


@@ -57,351 +47,326 @@ wxRadioBox::wxRadioBox()
 {
     m_noItems = 0;
     m_noRowsOrCols = 0;
 {
     m_noItems = 0;
     m_noRowsOrCols = 0;

-    m_majorDim = 0 ;

     m_radioButtonCycle = NULL;
 }
 
     m_radioButtonCycle = NULL;
 }
 

-//-------------------------------------------------------------------------------------
-//         ¥ wxRadioBox(wxWindow*, wxWindowID, const wxString&, const wxPoint&,
-//                        const wxSize&, int, const wxString[], int, long,
-//                        const wxValidator&, const wxString&)
-//-------------------------------------------------------------------------------------
-// Contructor, creating and showing a radiobox
-//
-// inline defined
-//
-
-//-------------------------------------------------------------------------------------
-//         ¥ ~wxRadioBox
-//-------------------------------------------------------------------------------------
-// Destructor, destroying the radiobox item
-

 wxRadioBox::~wxRadioBox()
 {
     m_isBeingDeleted = true;
 
 wxRadioBox::~wxRadioBox()
 {
     m_isBeingDeleted = true;
 

-    wxRadioButton *next,*current;
+    wxRadioButton *next, *current;
+
+    current = m_radioButtonCycle->NextInCycle();
+    if (current != NULL)
+    {
+        while (current != m_radioButtonCycle)
+        {
+            next = current->NextInCycle();
+            delete current;
+
+            current = next;
+        }

 
 

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

         delete current;
         delete current;

-        current=next;
-        next=current->NextInCycle();

     }
     }

-    delete current;

 }
 
 }
 

-//-------------------------------------------------------------------------------------
-//         ¥ Create
-//-------------------------------------------------------------------------------------

 // Create the radiobox for two-step construction
 
 // Create the radiobox for two-step construction
 

-bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
-                        const wxPoint& pos, const wxSize& size,
-                        const wxArrayString& choices,
-                        int majorDim, long style,
-                        const wxValidator& val, const wxString& name)
+bool wxRadioBox::Create( wxWindow *parent,
+    wxWindowID id, const wxString& label,
+    const wxPoint& pos, const wxSize& size,
+    const wxArrayString& choices,
+    int majorDim, long style,
+    const wxValidator& val, const wxString& name )

 {
     wxCArrayString chs(choices);
 
 {
     wxCArrayString chs(choices);
 

-    return Create(parent, id, label, pos, size, chs.GetCount(),
-                  chs.GetStrings(), majorDim, style, val, name);
+    return Create(
+        parent, id, label, pos, size, chs.GetCount(),
+        chs.GetStrings(), majorDim, style, val, name);

 }
 
 }
 

-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)
+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 )

 {
     m_macIsUserPane = false ;
 
 {
     m_macIsUserPane = false ;
 

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

         return false;
 
     int i;
 
         return false;
 
     int i;
 

-    m_noItems = n;
+    m_noItems = (unsigned int)n;

     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
 
     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
 

-    if (majorDim==0)
-        m_majorDim = n ;
-    else
-        m_majorDim = majorDim ;
+    SetMajorDim( majorDim == 0 ? n : majorDim, style );

 
 

+    m_labelOrig = m_label = label;

 
 

-    m_label = label ;
-
-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    if( bounds.right <= bounds.left )
-        bounds.right = bounds.left + 100 ;
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );
+    if ( bounds.right <= bounds.left )
+        bounds.right = bounds.left + 100;

     if ( bounds.bottom <= bounds.top )
     if ( bounds.bottom <= bounds.top )

-        bounds.bottom = bounds.top + 100 ;
+        bounds.bottom = bounds.top + 100;

 
 

-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl( this );

 
 

-    verify_noerr(CreateGroupBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, CFSTR("") ,
-        true /*primary*/ , m_peer->GetControlRefAddr() ) ) ;
+    OSStatus err = CreateGroupBoxControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
+        &bounds, CFSTR("") , true /*primary*/,
+        m_peer->GetControlRefAddr() );
+    verify_noerr( err );

 
     for (i = 0; i < n; i++)
     {
 
     for (i = 0; i < n; i++)
     {

-        wxRadioButton *radBtn = new wxRadioButton
-                                    (
-                                        this,
-                                        wxID_ANY,
-                                        wxStripMenuCodes(choices[i]),
-                                        wxPoint(5,20*i+10),
-                                        wxDefaultSize,
-                                        i == 0 ? wxRB_GROUP : 0
-                                    );
+        wxRadioButton *radBtn = new wxRadioButton(
+            this,
+            wxID_ANY,
+            GetLabelText(choices[i]),
+            wxPoint( 5, 20 * i + 10 ),
+            wxDefaultSize,
+            i == 0 ? wxRB_GROUP : 0 );
+

         if ( i == 0 )
         if ( i == 0 )

-            m_radioButtonCycle = radBtn ;
-        //        m_radioButtonCycle=radBtn->AddInCycle(m_radioButtonCycle);
+            m_radioButtonCycle = radBtn;
+//        m_radioButtonCycle = radBtn->AddInCycle( m_radioButtonCycle );

     }
 
     }
 

-    SetSelection(0);
-    MacPostControlCreate(pos,size) ;
+    SetSelection( 0 );
+    MacPostControlCreate( pos, size );

 
     return true;
 }
 
 
     return true;
 }
 

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

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

-
+//

 bool wxRadioBox::Enable(bool enable)
 {
 bool wxRadioBox::Enable(bool enable)
 {

-    int i;

     wxRadioButton *current;
 
     wxRadioButton *current;
 

-    if (!wxControl::Enable(enable))
+    if (!wxControl::Enable( enable ))

         return false;
 
     current = m_radioButtonCycle;
         return false;
 
     current = m_radioButtonCycle;

-    for (i = 0; i < m_noItems; i++) {
-        current->Enable(enable);
+    for (unsigned int i = 0; i < m_noItems; i++)
+    {
+        current->Enable( enable );

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

+

     return true;
 }
 
     return true;
 }
 

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

 // Enables or disables an given button
 // Enables or disables an given button

-
-bool wxRadioBox::Enable(int item, bool enable)
+//
+bool wxRadioBox::Enable(unsigned int item, bool enable)

 {
 {

-    int i;
-    wxRadioButton *current;
+    if (!IsValid( item ))
+        return false;

 
 

-    if ((item < 0) || (item >= m_noItems))
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;
+    while (i != item)
+    {
+        i++;
+        current = current->NextInCycle();
+    }
+
+    return current->Enable( enable );
+}
+
+bool wxRadioBox::IsItemEnabled(unsigned int item) const
+{
+    if (!IsValid( item ))

         return false;
 
         return false;
 

-    i = 0;
-    current = m_radioButtonCycle;
-    while (i != item) {
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;
+    while (i != item)
+    {

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

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

 }
 
 }
 

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

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

-
+//

 wxString wxRadioBox::GetLabel() const
 {
     return wxControl::GetLabel();
 }
 
 wxString wxRadioBox::GetLabel() const
 {
     return wxControl::GetLabel();
 }
 

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

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

-
-wxString wxRadioBox::GetString(int item) const
+//
+wxString wxRadioBox::GetString(unsigned int item) const

 {
 {

-    int i;

     wxRadioButton *current;
 
     wxRadioButton *current;
 

-    if ((item < 0) || (item >= m_noItems))
+    if (!IsValid( item ))

         return wxEmptyString;
 
         return wxEmptyString;
 

-    i = 0;
+    unsigned int i = 0;

     current = m_radioButtonCycle;
     current = m_radioButtonCycle;

-    while (i != item) {
+    while (i != item)
+    {

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

+

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

-//-------------------------------------------------------------------------------------
-//         ¥ GetSelection
-//-------------------------------------------------------------------------------------

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

-
+//

 int wxRadioBox::GetSelection() const
 {
     int i;
     wxRadioButton *current;
 
 int wxRadioBox::GetSelection() const
 {
     int i;
     wxRadioButton *current;
 

-    i=0;
-    current=m_radioButtonCycle;
-    while (!current->GetValue()) {
+    i = 0;
+    current = m_radioButtonCycle;
+    while (!current->GetValue())
+    {

         i++;
         i++;

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

     }
 
     return i;
 }
 
     }
 
     return i;
 }
 

-//-------------------------------------------------------------------------------------
-//         ¥ Number
-//-------------------------------------------------------------------------------------
-// Returns the number of buttons in the radiobox
-//
-// inline defined
-//
-
-//-------------------------------------------------------------------------------------
-//         ¥ SetLabel(const wxString&)
-//-------------------------------------------------------------------------------------

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

-
+//

 void wxRadioBox::SetLabel(const wxString& label)
 {
 void wxRadioBox::SetLabel(const wxString& label)
 {

-    return wxControl::SetLabel(label);
+    return wxControl::SetLabel( label );

 }
 
 }
 

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

 // Sets the label of a given button
 // Sets the label of a given button

-
-void wxRadioBox::SetString(int item,const wxString& label)
+//
+void wxRadioBox::SetString(unsigned int item,const wxString& label)

 {
 {

-       int i;
-    wxRadioButton *current;
-
-    if ((item < 0) || (item >= m_noItems))
+    if (!IsValid( item ))

         return;
         return;

-    i=0;
-    current=m_radioButtonCycle;
-    while (i!=item) {
+
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;
+    while (i != item)
+    {

         i++;
         i++;

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

     }
     }

-    return current->SetLabel(label);
+
+    return current->SetLabel( label );

 }
 
 }
 

-//-------------------------------------------------------------------------------------
-//         ¥ 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

-
+//

 void wxRadioBox::SetSelection(int item)
 {
     int i;
     wxRadioButton *current;
 
 void wxRadioBox::SetSelection(int item)
 {
     int i;
     wxRadioButton *current;
 

-    if ((item < 0) || (item >= m_noItems))
+    if (!IsValid( item ))

         return;
         return;

-    i=0;
-    current=m_radioButtonCycle;
-    while (i!=item) {
+
+    i = 0;
+    current = m_radioButtonCycle;
+    while (i != item)
+    {

         i++;
         i++;

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

     }
     }

-    current->SetValue(true);

 
 

+    current->SetValue( true );

 }
 
 }
 

-//-------------------------------------------------------------------------------------
-//         ¥ Show(bool)
-//-------------------------------------------------------------------------------------

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

-
+//

 bool wxRadioBox::Show(bool show)
 {
 bool wxRadioBox::Show(bool show)
 {

-    int i;

     wxRadioButton *current;
 
     wxRadioButton *current;
 

-    wxControl::Show(show);
-
-    current=m_radioButtonCycle;
-       for (i=0;i<m_noItems;i++) {
-        current->Show(show);
-        current=current->NextInCycle();
+    current = m_radioButtonCycle;
+    for (unsigned int i=0; i<m_noItems; i++)
+    {
+        current->Show( show );
+        current = current->NextInCycle();

     }
     }

+
+    wxControl::Show( show );
+

     return true;
 }
 
     return true;
 }
 

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

 // Shows or hides the given button
 // Shows or hides the given button

+//
+bool wxRadioBox::Show(unsigned int item, bool show)
+{
+    if (!IsValid( item ))
+        return false;

 
 

-void wxRadioBox::Show(int item, bool show)
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;
+    while (i != item)
+    {
+        i++;
+        current = current->NextInCycle();
+    }
+
+    return current->Show( show );
+}
+
+bool wxRadioBox::IsItemShown(unsigned int item) const

 {
 {

-       int i;
-    wxRadioButton *current;
+    if (!IsValid( item ))
+        return false;

 
 

-    if ((item < 0) || (item >= m_noItems))
-        return;
-    i=0;
-    current=m_radioButtonCycle;
-    while (i!=item) {
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;
+    while (i != item)
+    {

         i++;
         i++;

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

     }
     }

-    current->Show(show);
+
+    return current->IsShown();

 }
 
 }
 

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

 
 

-void wxRadioBox::Command (wxCommandEvent & event)
+// Simulates the effect of the user issuing a command to the item
+//
+void wxRadioBox::Command( wxCommandEvent& event )

 {
 {

-    SetSelection (event.GetInt());
-    ProcessCommand (event);
+    SetSelection( event.GetInt() );
+    ProcessCommand( event );

 }
 
 }
 

-//-------------------------------------------------------------------------------------
-//         ¥ SetFocus
-//-------------------------------------------------------------------------------------

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

-
+//

 void wxRadioBox::SetFocus()
 {
 void wxRadioBox::SetFocus()
 {

-    int i;

     wxRadioButton *current;
 
     wxRadioButton *current;
 

-    i=0;
-    current=m_radioButtonCycle;
-    while (!current->GetValue()) {
-        i++;
-        current=current->NextInCycle();
+    current = m_radioButtonCycle;
+    while (!current->GetValue())
+    {
+        current = current->NextInCycle();

     }
     }

+

     current->SetFocus();
 }
 
     current->SetFocus();
 }
 

-
-//-------------------------------------------------------------------------------------
-//         ¥ 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

-
+//

 #define RADIO_SIZE 20
 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 #define RADIO_SIZE 20
 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)


@@ -412,79 +377,86 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     // define the position
 
     int x_current, y_current;
     // define the position
 
     int x_current, y_current;

-    int x_offset,y_offset;
+    int x_offset, y_offset;

     int widthOld, heightOld;
     int widthOld, heightOld;

-    GetSize(&widthOld, &heightOld);
+
+    GetSize( &widthOld, &heightOld );
+    GetPosition( &x_current, &y_current );

 
     x_offset = x;
     y_offset = y;
 
     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;
+    if (!(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    {
+        if (x == wxDefaultCoord)
+            x_offset = x_current;
+        if (y == wxDefaultCoord)
+            y_offset = y_current;
+    }

 
     // define size
 
     // define size

+    int charWidth, charHeight;
+    int maxWidth, maxHeight;
+    int eachWidth[128], eachHeight[128];
+    int totWidth, totHeight;

 
 

-    int charWidth,charHeight;
-    int maxWidth,maxHeight;
-    int eachWidth[128],eachHeight[128];
-    int totWidth,totHeight;
-
-    GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), &charWidth, &charHeight);
+    GetTextExtent(
+        wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
+        &charWidth, &charHeight );

 
 

-    charWidth/=52;
+    charWidth /= 52;

 
 

-    maxWidth=-1;
-    maxHeight=-1;
-    for (i = 0 ; i < m_noItems; i++)
+    maxWidth = -1;
+    maxHeight = -1;
+    for (unsigned int i = 0 ; i < m_noItems; i++)

     {
     {

-        GetTextExtent(GetString(i), &eachWidth[i], &eachHeight[i]);
+        GetTextExtent(GetString(i), &eachWidth[i], &eachHeight[i] );

         eachWidth[i] = (int)(eachWidth[i] + RADIO_SIZE);
         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];
-          }
+        eachHeight[i] = (int)((3 * eachHeight[i]) / 2);

 
 

-    totHeight = GetRowCount() * ( maxHeight ) ;
-    totWidth  = GetColumnCount() * (maxWidth + charWidth) ;
+        if (maxWidth < eachWidth[i])
+            maxWidth = eachWidth[i];
+        if (maxHeight < eachHeight[i])
+            maxHeight = eachHeight[i];
+    }
+
+    totHeight = GetRowCount() * maxHeight;
+    totWidth  = GetColumnCount() * (maxWidth + charWidth);

 
 

-    wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth , totHeight ) ) ;
+    wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth, totHeight ) ) ;

 
 

-    // only change our width/height if asked for
-    if ( width == -1 )
+    // change the width / height only when specified
+    if ( width == wxDefaultCoord )

     {
         if ( sizeFlags & wxSIZE_AUTO_WIDTH )
     {
         if ( sizeFlags & wxSIZE_AUTO_WIDTH )

-            width = sz.x ;
+            width = sz.x;

         else
             width = widthOld;
     }
 
         else
             width = widthOld;
     }
 

-    if ( height == -1 )
+    if ( height == wxDefaultCoord )

     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )

-            height = sz.y ;
+            height = sz.y;

         else
             height = heightOld;
     }
 
         else
             height = heightOld;
     }
 

-    wxControl::DoSetSize(x_offset,y_offset,width,height,wxSIZE_AUTO);
-
-    // arrange radiobuttons
-
-    int x_start,y_start;
+    wxControl::DoSetSize( x_offset, y_offset, width, height, wxSIZE_AUTO );

 
 

+    // arrange radio buttons
+    int x_start, y_start;

 
     x_start = 0;
 
     x_start = 0;

-    y_start = 0 ;
+    y_start = 0;

 
     x_offset = x_start;
     y_offset = y_start;
 
 
     x_offset = x_start;
     y_offset = y_start;
 

-    current=m_radioButtonCycle;
-    for ( i = 0 ; i < m_noItems; i++)
+    current = m_radioButtonCycle;
+    for (i = 0 ; i < (int)m_noItems; i++)

     {
     {

-        if (i&&((i%m_majorDim)==0)) // not to do for the zero button!
+        // not to do for the zero button!
+        if ((i > 0) && ((i % GetMajorDim()) == 0))

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


@@ -494,15 +466,15 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             else
             {
                 x_offset = x_start;
             else
             {
                 x_offset = x_start;

-                y_offset += maxHeight ; /*+ charHeight/2;*/
+                y_offset += maxHeight ; //+ charHeight / 2

             }
         }
 
             }
         }
 

-        current->SetSize(x_offset,y_offset,eachWidth[i],eachHeight[i]);
-        current=current->NextInCycle();
+        current->SetSize( x_offset, y_offset, eachWidth[i], eachHeight[i]);
+        current = current->NextInCycle();

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

-            y_offset += maxHeight ; /*+ charHeight/2;*/
+            y_offset += maxHeight ; // + charHeight / 2

         else
             x_offset += maxWidth + charWidth;
     }
         else
             x_offset += maxWidth + charWidth;
     }


@@ -515,71 +487,41 @@ wxSize wxRadioBox::DoGetBestSize() const
     int eachWidth, eachHeight;
     int totWidth, totHeight;
 
     int eachWidth, eachHeight;
     int totWidth, totHeight;
 

-    wxFont font = /*GetParent()->*/GetFont();
-    GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
-        &charWidth, &charHeight, NULL, NULL, &font);
+    wxFont font = GetFont(); // GetParent()->GetFont()
+    GetTextExtent(
+        wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
+        &charWidth, &charHeight, NULL, NULL, &font );

 
     charWidth /= 52;
 
     maxWidth = -1;
     maxHeight = -1;
 
 
     charWidth /= 52;
 
     maxWidth = -1;
     maxHeight = -1;
 

-    for (int i = 0 ; i < m_noItems; i++)
+    for (unsigned int i = 0 ; i < m_noItems; i++)

     {
     {

-        GetTextExtent(GetString(i), &eachWidth, &eachHeight,NULL, NULL, &font);
-        eachWidth  = (int)(eachWidth + RADIO_SIZE) ;
+        GetTextExtent(GetString(i), &eachWidth, &eachHeight, NULL, NULL, &font );
+        eachWidth  = (int)(eachWidth + RADIO_SIZE);

         eachHeight = (int)((3 * eachHeight) / 2);
         eachHeight = (int)((3 * eachHeight) / 2);

-        if (maxWidth < eachWidth)     maxWidth = eachWidth;
-        if (maxHeight < eachHeight)   maxHeight = eachHeight;
+        if (maxWidth < eachWidth)
+            maxWidth = eachWidth;
+        if (maxHeight < eachHeight)
+            maxHeight = eachHeight;

     }
 
     }
 

-    totHeight = GetRowCount() * (maxHeight ) ;
-    totWidth  = GetColumnCount() * (maxWidth + charWidth) ;
+    totHeight = GetRowCount() * maxHeight;
+    totWidth  = GetColumnCount() * (maxWidth + charWidth);

 
 

-    wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth , totHeight ) ) ;
-    totWidth = sz.x ;
-    totHeight = sz.y ;
+    wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth, totHeight ) );
+    totWidth = sz.x;
+    totHeight = sz.y;

 
     // handle radio box title as well
 
     // handle radio box title as well

-    GetTextExtent(GetTitle(), &eachWidth, NULL);
-    eachWidth  = (int)(eachWidth + RADIO_SIZE) + 3 * charWidth ;
+    GetTextExtent( GetLabel(), &eachWidth, NULL );
+    eachWidth  = (int)(eachWidth + RADIO_SIZE) +  3 * charWidth;

     if (totWidth < eachWidth)
         totWidth = eachWidth;
 
     if (totWidth < eachWidth)
         totWidth = eachWidth;
 

-    return wxSize(totWidth, totHeight);
-}
-//-------------------------------------------------------------------------------------
-//         ¥ GetNumVer
-//-------------------------------------------------------------------------------------
-// return the number of buttons in the vertical direction
-
-int wxRadioBox::GetRowCount() const
-{
-    if ( m_windowStyle & wxRA_SPECIFY_ROWS )
-    {
-        return m_majorDim;
-    }
-    else
-    {
-        return (m_noItems + m_majorDim - 1)/m_majorDim;
-    }
-}
-
-//-------------------------------------------------------------------------------------
-//         ¥ GetNumHor
-//-------------------------------------------------------------------------------------
-// return the number of buttons in the horizontal direction
-
-int wxRadioBox::GetColumnCount() const
-{
-    if ( m_windowStyle & wxRA_SPECIFY_ROWS )
-    {
-        return (m_noItems + m_majorDim - 1)/m_majorDim;
-    }
-    else
-    {
-        return m_majorDim;
-    }
+    return wxSize( totWidth, totHeight );

 }
 
 }
 

-#endif
+#endif // wxUSE_RADIOBOX