X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..cb0b7b7d811356f729315fc14c7e0d311f43384d:/src/univ/radiobox.cpp

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index 621fde6d6f..6a23d3d34b 100644
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univradiobox.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -74,7 +70,7 @@ public:
         {
             if ( m_radio->OnKeyDown((wxKeyEvent &)event) )
             {
-                return TRUE;
+                return true;
             }
         }
 
@@ -99,7 +95,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 void wxRadioBox::Init()
 {
     m_selection = -1;
-    m_majorDim = 0;
 }
 
 wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
@@ -112,7 +107,7 @@ wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
 
     Init();
 
-    (void)Create(parent, id, title, pos, size, chs.GetCount(), 
+    (void)Create(parent, id, title, pos, size, chs.GetCount(),
                  chs.GetStrings(), majorDim, style, val, name);
 }
 
@@ -129,7 +124,7 @@ bool wxRadioBox::Create(wxWindow *parent,
 {
     wxCArrayString chs(choices);
 
-    return Create(parent, id, title, pos, size, chs.GetCount(), 
+    return Create(parent, id, title, pos, size, chs.GetCount(),
                   chs.GetStrings(), majorDim, style, val, name);
 }
 
@@ -142,7 +137,7 @@ bool wxRadioBox::Create(wxWindow *parent,
                         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?)
@@ -169,7 +164,7 @@ bool wxRadioBox::Create(wxWindow *parent,
     }
 
     if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )
-        return FALSE;
+        return false;
 
 #if wxUSE_VALIDATORS
     SetValidator(val);
@@ -178,7 +173,7 @@ bool wxRadioBox::Create(wxWindow *parent,
     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 )
     {
@@ -193,7 +188,7 @@ bool wxRadioBox::Create(wxWindow *parent,
     // radiobox should already have selection so select at least one item
     SetSelection(0);
 
-    return TRUE;
+    return true;
 }
 
 wxRadioBox::~wxRadioBox()
@@ -205,7 +200,7 @@ wxRadioBox::~wxRadioBox()
     size_t count = m_buttons.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
-        m_buttons[n]->PopEventHandler(TRUE /* delete it */);
+        m_buttons[n]->PopEventHandler(true /* delete it */);
 
         delete m_buttons[n];
     }
@@ -215,26 +210,6 @@ wxRadioBox::~wxRadioBox()
 // 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 )
@@ -246,7 +221,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
-        wxRadioButton *btn = new wxRadioButton(parent, -1, choices[n],
+        wxRadioButton *btn = new wxRadioButton(parent, wxID_ANY, choices[n],
                                                wxDefaultPosition,
                                                wxDefaultSize,
                                                n == 0 ? wxRB_GROUP : 0);
@@ -273,7 +248,7 @@ void wxRadioBox::SetSelection(int n)
     btn->SetFocus();
 
     // this will also unselect the previously selected button in our group
-    btn->SetValue(TRUE);
+    btn->SetValue(true);
 }
 
 int wxRadioBox::GetSelection() const
@@ -309,7 +284,7 @@ void wxRadioBox::OnRadioButton(wxEvent& event)
 
 wxString wxRadioBox::GetString(int n) const
 {
-    wxCHECK_MSG( IsValid(n), _T(""),
+    wxCHECK_MSG( IsValid(n), wxEmptyString,
                  _T("invalid index in wxRadioBox::GetString") );
 
     return m_buttons[n]->GetLabel();
@@ -322,18 +297,32 @@ void wxRadioBox::SetString(int n, const wxString& label)
     m_buttons[n]->SetLabel(label);
 }
 
-void wxRadioBox::Enable(int n, bool enable)
+bool wxRadioBox::Enable(int n, bool enable)
+{
+    wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Enable") );
+
+    return m_buttons[n]->Enable(enable);
+}
+
+bool wxRadioBox::IsItemEnabled(int n) const
+{
+    wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::IsItemEnabled") );
+
+    return m_buttons[n]->IsEnabled();
+}
+
+bool wxRadioBox::Show(int n, bool show)
 {
-    wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Enable") );
+    wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Show") );
 
-    m_buttons[n]->Enable(enable);
+    return m_buttons[n]->Show(show);
 }
 
-void wxRadioBox::Show(int n, bool show)
+bool wxRadioBox::IsItemShown(int n) const
 {
-    wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Show") );
+    wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::IsItemShown") );
 
-    m_buttons[n]->Show(show);
+    return m_buttons[n]->IsShown();
 }
 
 // ----------------------------------------------------------------------------
@@ -343,7 +332,7 @@ void wxRadioBox::Show(int n, bool show)
 bool wxRadioBox::Enable(bool enable)
 {
     if ( !wxStaticBox::Enable(enable) )
-        return FALSE;
+        return false;
 
     // also enable/disable the buttons
     size_t count = m_buttons.GetCount();
@@ -352,13 +341,13 @@ bool wxRadioBox::Enable(bool enable)
         Enable(n, enable);
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxRadioBox::Show(bool show)
 {
     if ( !wxStaticBox::Show(show) )
-        return FALSE;
+        return false;
 
     // also show/hide the buttons
     size_t count = m_buttons.GetCount();
@@ -367,7 +356,7 @@ bool wxRadioBox::Show(bool show)
         Show(n, show);
     }
 
-    return TRUE;
+    return true;
 }
 
 wxString wxRadioBox::GetLabel() const
@@ -403,7 +392,7 @@ void wxRadioBox::DoSetToolTip(wxToolTip *tooltip)
 
 wxSize wxRadioBox::GetMaxButtonSize() const
 {
-    int widthMax, heightMax, width, height;
+    int widthMax, heightMax, width = 0, height = 0;
     widthMax = heightMax = 0;
 
     int count = GetCount();
@@ -424,8 +413,8 @@ wxSize wxRadioBox::DoGetBestClientSize() const
 {
     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;
@@ -461,7 +450,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
         if ( GetWindowStyle() & wxRA_TOPTOBOTTOM )
         {
             // from top to bottom
-            if ( (n + 1) % m_numRows )
+            if ( (n + 1) % GetRowCount() )
             {
                 // continue in this column
                 y += sizeBtn.y;
@@ -476,7 +465,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
         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;
@@ -517,7 +506,7 @@ bool wxRadioBox::OnKeyDown(wxKeyEvent& event)
             break;
 
         default:
-            return FALSE;
+            return false;
     }
 
     int selOld = GetSelection();
@@ -530,7 +519,7 @@ bool wxRadioBox::OnKeyDown(wxKeyEvent& event)
         SendRadioEvent();
     }
 
-    return TRUE;
+    return true;
 }
 
 #endif // wxUSE_RADIOBOX