remove unnecessary DoGetBestSize

[wxWidgets.git] / src / univ / radiobox.cpp

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index 3ad1c0730472eb4a2ee8b4c5205e2d7b2b07343d..ac606d1cd3bcf011dab6861d5b6adafe5c408a81 100644 (file)
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        univ/radiobox.cpp
+// Name:        src/univ/radiobox.cpp

 // Purpose:     wxRadioBox implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Purpose:     wxRadioBox implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

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

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "univradiobox.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -29,11 +25,13 @@
 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 

+#include "wx/radiobox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"

-    #include "wx/radiobox.h"

     #include "wx/radiobut.h"
     #include "wx/validate.h"
     #include "wx/radiobut.h"
     #include "wx/validate.h"

+    #include "wx/arrstr.h"

 #endif
 
 #include "wx/tooltip.h"
 #endif
 
 #include "wx/tooltip.h"


@@ -73,7 +71,7 @@ public:
         {
             if ( m_radio->OnKeyDown((wxKeyEvent &)event) )
             {
         {
             if ( m_radio->OnKeyDown((wxKeyEvent &)event) )
             {

-                return TRUE;
+                return true;

             }
         }
 
             }
         }
 


@@ -98,7 +96,37 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 void wxRadioBox::Init()
 {
     m_selection = -1;
 void wxRadioBox::Init()
 {
     m_selection = -1;

-    m_majorDim = 0;
+}
+
+wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
+                       const wxPoint& pos, const wxSize& size,
+                       const wxArrayString& choices,
+                       int majorDim, long style,
+                       const wxValidator& val, const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    Init();
+
+    (void)Create(parent, id, title, pos, size, chs.GetCount(),
+                 chs.GetStrings(), majorDim, style, val, name);
+}
+
+bool wxRadioBox::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxString& title,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        const wxArrayString& choices,
+                        int majorDim,
+                        long style,
+                        const wxValidator& val,
+                        const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    return Create(parent, id, title, pos, size, chs.GetCount(),
+                  chs.GetStrings(), majorDim, style, val, name);

 }
 
 bool wxRadioBox::Create(wxWindow *parent,
 }
 
 bool wxRadioBox::Create(wxWindow *parent,


@@ -110,7 +138,7 @@ bool wxRadioBox::Create(wxWindow *parent,
                         const wxString *choices,
                         int majorDim,
                         long style,
                         const wxString *choices,
                         int majorDim,
                         long style,

-                        const wxValidator& val,
+                        const wxValidator& wxVALIDATOR_PARAM(val),

                         const wxString& name)
 {
     // for compatibility with the other ports which don't handle (yet?)
                         const wxString& name)
 {
     // for compatibility with the other ports which don't handle (yet?)


@@ -119,25 +147,25 @@ bool wxRadioBox::Create(wxWindow *parent,
     if ( !(style & (wxRA_LEFTTORIGHT | wxRA_TOPTOBOTTOM)) )
     {
         // horizontal radiobox use left to right layout
     if ( !(style & (wxRA_LEFTTORIGHT | wxRA_TOPTOBOTTOM)) )
     {
         // horizontal radiobox use left to right layout

-        if ( style & wxRA_HORIZONTAL )
+        if ( style & wxRA_SPECIFY_COLS )

         {
             style |= wxRA_LEFTTORIGHT;
         }
         {
             style |= wxRA_LEFTTORIGHT;
         }

-        else if ( style & wxRA_VERTICAL )
+        else if ( style & wxRA_SPECIFY_ROWS )

         {
             style |= wxRA_TOPTOBOTTOM;
         }
         else
         {
         {
             style |= wxRA_TOPTOBOTTOM;
         }
         else
         {

-            wxFAIL_MSG( _T("you must specify wxRA_XXX style!") );
+            wxFAIL_MSG( wxT("you must specify wxRA_XXX style!") );

 
             // use default
 
             // use default

-            style = wxRA_HORIZONTAL | wxRA_LEFTTORIGHT;
+            style = wxRA_SPECIFY_COLS | wxRA_LEFTTORIGHT;

         }
     }
 
     if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )
         }
     }
 
     if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )

-        return FALSE;
+        return false;

 
 #if wxUSE_VALIDATORS
     SetValidator(val);
 
 #if wxUSE_VALIDATORS
     SetValidator(val);


@@ -146,17 +174,22 @@ bool wxRadioBox::Create(wxWindow *parent,
     Append(n, choices);
 
     // majorDim default value is 0 which means make one row/column
     Append(n, choices);
 
     // majorDim default value is 0 which means make one row/column

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

 
     if ( size == wxDefaultSize )
     {
         SetClientSize(DoGetBestClientSize());
     }
 
 
     if ( size == wxDefaultSize )
     {
         SetClientSize(DoGetBestClientSize());
     }
 

+    // Need to move the radiobox in order to move the radio buttons
+    wxPoint actualPos = GetPosition();
+    wxSize actualSize = GetSize();
+    DoMoveWindow(actualPos.x, actualPos.y, actualSize.x, actualSize.y);
+

     // radiobox should already have selection so select at least one item
     SetSelection(0);
 
     // radiobox should already have selection so select at least one item
     SetSelection(0);
 

-    return TRUE;
+    return true;

 }
 
 wxRadioBox::~wxRadioBox()
 }
 
 wxRadioBox::~wxRadioBox()


@@ -165,10 +198,10 @@ wxRadioBox::~wxRadioBox()
     // the buttons themselves: this must be done as the user code expects them
     // to disappear now and not some time later when they will be deleted by
     // our (common) parent
     // the buttons themselves: this must be done as the user code expects them
     // to disappear now and not some time later when they will be deleted by
     // our (common) parent

-    size_t count = m_buttons.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    unsigned int count = m_buttons.GetCount();
+    for ( unsigned int n = 0; n < count; n++ )

     {
     {

-        m_buttons[n]->PopEventHandler(TRUE /* delete it */);
+        m_buttons[n]->PopEventHandler(true /* delete it */);

 
         delete m_buttons[n];
     }
 
         delete m_buttons[n];
     }


@@ -178,26 +211,6 @@ wxRadioBox::~wxRadioBox()
 // wxRadioBox init
 // ----------------------------------------------------------------------------
 
 // wxRadioBox init
 // ----------------------------------------------------------------------------
 

-void wxRadioBox::SetMajorDim(int majorDim)
-{
-    wxCHECK_RET( majorDim != 0, _T("major radiobox dimension can't be 0") );
-
-    m_majorDim = majorDim;
-
-    int minorDim = (GetCount() + m_majorDim - 1) / m_majorDim;
-
-    if ( GetWindowStyle() & wxRA_SPECIFY_COLS )
-    {
-        m_numCols = majorDim;
-        m_numRows = minorDim;
-    }
-    else // wxRA_SPECIFY_ROWS
-    {
-        m_numCols = minorDim;
-        m_numRows = majorDim;
-    }
-}
-

 void wxRadioBox::Append(int count, const wxString *choices)
 {
     if ( !count )
 void wxRadioBox::Append(int count, const wxString *choices)
 {
     if ( !count )


@@ -209,7 +222,7 @@ void wxRadioBox::Append(int count, const wxString *choices)
     {
         // make the first button in the box the start of new group by giving it
         // wxRB_GROUP style
     {
         // make the first button in the box the start of new group by giving it
         // wxRB_GROUP style

-        wxRadioButton *btn = new wxRadioButton(parent, -1, choices[n],
+        wxRadioButton *btn = new wxRadioButton(parent, wxID_ANY, choices[n],

                                                wxDefaultPosition,
                                                wxDefaultSize,
                                                n == 0 ? wxRB_GROUP : 0);
                                                wxDefaultPosition,
                                                wxDefaultSize,
                                                n == 0 ? wxRB_GROUP : 0);


@@ -226,7 +239,7 @@ void wxRadioBox::Append(int count, const wxString *choices)
 
 void wxRadioBox::SetSelection(int n)
 {
 
 void wxRadioBox::SetSelection(int n)
 {

-    wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::SetSelection") );
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxRadioBox::SetSelection") );

 
     m_selection = n;
 
 
     m_selection = n;
 


@@ -236,7 +249,7 @@ void wxRadioBox::SetSelection(int n)
     btn->SetFocus();
 
     // this will also unselect the previously selected button in our group
     btn->SetFocus();
 
     // this will also unselect the previously selected button in our group

-    btn->SetValue(TRUE);
+    btn->SetValue(true);

 }
 
 int wxRadioBox::GetSelection() const
 }
 
 int wxRadioBox::GetSelection() const


@@ -246,7 +259,7 @@ int wxRadioBox::GetSelection() const
 
 void wxRadioBox::SendRadioEvent()
 {
 
 void wxRadioBox::SendRadioEvent()
 {

-    wxCHECK_RET( m_selection != -1, _T("no active radio button") );
+    wxCHECK_RET( m_selection != -1, wxT("no active radio button") );

 
     wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, GetId());
     InitCommandEvent(event);
 
     wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, GetId());
     InitCommandEvent(event);


@@ -259,7 +272,7 @@ void wxRadioBox::SendRadioEvent()
 void wxRadioBox::OnRadioButton(wxEvent& event)
 {
     int n = m_buttons.Index((wxRadioButton *)event.GetEventObject());
 void wxRadioBox::OnRadioButton(wxEvent& event)
 {
     int n = m_buttons.Index((wxRadioButton *)event.GetEventObject());

-    wxCHECK_RET( n != wxNOT_FOUND, _T("click from alien radio button") );
+    wxCHECK_RET( n != wxNOT_FOUND, wxT("click from alien radio button") );

 
     m_selection = n;
 
 
     m_selection = n;
 


@@ -270,33 +283,47 @@ void wxRadioBox::OnRadioButton(wxEvent& event)
 // methods forwarded to the buttons
 // ----------------------------------------------------------------------------
 
 // methods forwarded to the buttons
 // ----------------------------------------------------------------------------
 

-wxString wxRadioBox::GetString(int n) const
+wxString wxRadioBox::GetString(unsigned int n) const

 {
 {

-    wxCHECK_MSG( IsValid(n), _T(""),
-                 _T("invalid index in wxRadioBox::GetString") );
+    wxCHECK_MSG( IsValid(n), wxEmptyString,
+                 wxT("invalid index in wxRadioBox::GetString") );

 
     return m_buttons[n]->GetLabel();
 }
 
 
     return m_buttons[n]->GetLabel();
 }
 

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

 {
 {

-    wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::SetString") );
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxRadioBox::SetString") );

 
     m_buttons[n]->SetLabel(label);
 }
 
 
     m_buttons[n]->SetLabel(label);
 }
 

-void wxRadioBox::Enable(int n, bool enable)
+bool wxRadioBox::Enable(unsigned int n, bool enable)

 {
 {

-    wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Enable") );
+    wxCHECK_MSG( IsValid(n), false, wxT("invalid index in wxRadioBox::Enable") );

 
 

-    m_buttons[n]->Enable(enable);
+    return m_buttons[n]->Enable(enable);

 }
 
 }
 

-void wxRadioBox::Show(int n, bool show)
+bool wxRadioBox::IsItemEnabled(unsigned int n) const

 {
 {

-    wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Show") );
+    wxCHECK_MSG( IsValid(n), false, wxT("invalid index in wxRadioBox::IsItemEnabled") );

 
 

-    m_buttons[n]->Show(show);
+    return m_buttons[n]->IsEnabled();
+}
+
+bool wxRadioBox::Show(unsigned int n, bool show)
+{
+    wxCHECK_MSG( IsValid(n), false, wxT("invalid index in wxRadioBox::Show") );
+
+    return m_buttons[n]->Show(show);
+}
+
+bool wxRadioBox::IsItemShown(unsigned int n) const
+{
+    wxCHECK_MSG( IsValid(n), false, wxT("invalid index in wxRadioBox::IsItemShown") );
+
+    return m_buttons[n]->IsShown();

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


@@ -306,31 +333,31 @@ void wxRadioBox::Show(int n, bool show)
 bool wxRadioBox::Enable(bool enable)
 {
     if ( !wxStaticBox::Enable(enable) )
 bool wxRadioBox::Enable(bool enable)
 {
     if ( !wxStaticBox::Enable(enable) )

-        return FALSE;
+        return false;

 
     // also enable/disable the buttons
 
     // also enable/disable the buttons

-    size_t count = m_buttons.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    const unsigned int count = m_buttons.GetCount();
+    for ( unsigned int n = 0; n < count; n++ )

     {
         Enable(n, enable);
     }
 
     {
         Enable(n, enable);
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxRadioBox::Show(bool show)
 {
     if ( !wxStaticBox::Show(show) )
 }
 
 bool wxRadioBox::Show(bool show)
 {
     if ( !wxStaticBox::Show(show) )

-        return FALSE;
+        return false;

 
     // also show/hide the buttons
 
     // also show/hide the buttons

-    size_t count = m_buttons.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    const unsigned int count = m_buttons.GetCount();
+    for ( unsigned int n = 0; n < count; n++ )

     {
         Show(n, show);
     }
 
     {
         Show(n, show);
     }
 

-    return TRUE;
+    return true;

 }
 
 wxString wxRadioBox::GetLabel() const
 }
 
 wxString wxRadioBox::GetLabel() const


@@ -349,8 +376,8 @@ void wxRadioBox::DoSetToolTip(wxToolTip *tooltip)
     wxControl::DoSetToolTip(tooltip);
 
     // Also set them for all Radio Buttons
     wxControl::DoSetToolTip(tooltip);
 
     // Also set them for all Radio Buttons

-    size_t count = m_buttons.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    const unsigned int count = m_buttons.GetCount();
+    for ( unsigned int n = 0; n < count; n++ )

     {
         if (tooltip)
             m_buttons[n]->SetToolTip(tooltip->GetTip());
     {
         if (tooltip)
             m_buttons[n]->SetToolTip(tooltip->GetTip());


@@ -366,11 +393,11 @@ void wxRadioBox::DoSetToolTip(wxToolTip *tooltip)
 
 wxSize wxRadioBox::GetMaxButtonSize() const
 {
 
 wxSize wxRadioBox::GetMaxButtonSize() const
 {

-    int widthMax, heightMax, width, height;
+    int widthMax, heightMax, width = 0, height = 0;

     widthMax = heightMax = 0;
 
     widthMax = heightMax = 0;
 

-    int count = GetCount();
-    for ( int n = 0; n < count; n++ )
+    const unsigned int count = GetCount();
+    for ( unsigned int n = 0; n < count; n++ )

     {
         m_buttons[n]->GetBestSize(&width, &height);
 
     {
         m_buttons[n]->GetBestSize(&width, &height);
 


@@ -387,8 +414,8 @@ wxSize wxRadioBox::DoGetBestClientSize() const
 {
     wxSize sizeBtn = GetMaxButtonSize();
 
 {
     wxSize sizeBtn = GetMaxButtonSize();
 

-    sizeBtn.x *= m_numCols;
-    sizeBtn.y *= m_numRows;
+    sizeBtn.x *= GetColumnCount();
+    sizeBtn.y *= GetRowCount();

 
     // add a border around all buttons
     sizeBtn.x += 2*BOX_BORDER_X;
 
     // add a border around all buttons
     sizeBtn.x += 2*BOX_BORDER_X;


@@ -416,15 +443,15 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
     int x = x0,
         y = y0;
 
     int x = x0,
         y = y0;
 

-    int count = GetCount();
-    for ( int n = 0; n < count; n++ )
+    const unsigned int count = GetCount();
+    for ( unsigned int n = 0; n < count; n++ )

     {
         m_buttons[n]->SetSize(x, y, sizeBtn.x, sizeBtn.y);
 
         if ( GetWindowStyle() & wxRA_TOPTOBOTTOM )
         {
             // from top to bottom
     {
         m_buttons[n]->SetSize(x, y, sizeBtn.x, sizeBtn.y);
 
         if ( GetWindowStyle() & wxRA_TOPTOBOTTOM )
         {
             // from top to bottom

-            if ( (n + 1) % m_numRows )
+            if ( (n + 1) % GetRowCount() )

             {
                 // continue in this column
                 y += sizeBtn.y;
             {
                 // continue in this column
                 y += sizeBtn.y;


@@ -439,7 +466,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
         else // wxRA_LEFTTORIGHT: mirror the code above
         {
             // from left to right
         else // wxRA_LEFTTORIGHT: mirror the code above
         {
             // from left to right

-            if ( (n + 1) % m_numCols )
+            if ( (n + 1) % GetColumnCount() )

             {
                 // continue in this row
                 x += sizeBtn.x;
             {
                 // continue in this row
                 x += sizeBtn.x;


@@ -480,7 +507,7 @@ bool wxRadioBox::OnKeyDown(wxKeyEvent& event)
             break;
 
         default:
             break;
 
         default:

-            return FALSE;
+            return false;

     }
 
     int selOld = GetSelection();
     }
 
     int selOld = GetSelection();


@@ -493,8 +520,7 @@ bool wxRadioBox::OnKeyDown(wxKeyEvent& event)
         SendRadioEvent();
     }
 
         SendRadioEvent();
     }
 

-    return TRUE;
+    return true;

 }
 
 #endif // wxUSE_RADIOBOX
 }
 
 #endif // wxUSE_RADIOBOX

-