X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..f968da288ee04ec5c0265861bb7a18182c0fb22e:/src/univ/radiobox.cpp diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp index 621fde6d6f..6a3d3f50bd 100644 --- a/src/univ/radiobox.cpp +++ b/src/univ/radiobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: univ/radiobox.cpp +// Name: src/univ/radiobox.cpp // Purpose: wxRadioBox implementation // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "univradiobox.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -29,9 +25,10 @@ #if wxUSE_RADIOBOX +#include "wx/radiobox.h" + #ifndef WX_PRECOMP #include "wx/dcclient.h" - #include "wx/radiobox.h" #include "wx/radiobut.h" #include "wx/validate.h" #include "wx/arrstr.h" @@ -74,7 +71,7 @@ public: { if ( m_radio->OnKeyDown((wxKeyEvent &)event) ) { - return TRUE; + return true; } } @@ -99,7 +96,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 +108,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 +125,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 +138,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 +165,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 +174,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 +189,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() @@ -202,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 - 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]; } @@ -215,26 +211,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 +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 - 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 +249,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 @@ -307,33 +283,47 @@ void wxRadioBox::OnRadioButton(wxEvent& event) // methods forwarded to the buttons // ---------------------------------------------------------------------------- -wxString wxRadioBox::GetString(int n) const +wxString wxRadioBox::GetString(unsigned int n) const { - wxCHECK_MSG( IsValid(n), _T(""), + wxCHECK_MSG( IsValid(n), wxEmptyString, _T("invalid index in wxRadioBox::GetString") ); 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") ); m_buttons[n]->SetLabel(label); } -void wxRadioBox::Enable(int n, bool enable) +bool wxRadioBox::Enable(unsigned int n, bool enable) +{ + wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Enable") ); + + return m_buttons[n]->Enable(enable); +} + +bool wxRadioBox::IsItemEnabled(unsigned int n) const +{ + wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::IsItemEnabled") ); + + return m_buttons[n]->IsEnabled(); +} + +bool wxRadioBox::Show(unsigned 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(unsigned 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,31 +333,31 @@ 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(); - 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); } - 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(); - 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); } - return TRUE; + return true; } wxString wxRadioBox::GetLabel() const @@ -386,8 +376,8 @@ void wxRadioBox::DoSetToolTip(wxToolTip *tooltip) 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()); @@ -403,11 +393,11 @@ 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(); - 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); @@ -424,8 +414,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; @@ -453,15 +443,15 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height) 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 - if ( (n + 1) % m_numRows ) + if ( (n + 1) % GetRowCount() ) { // continue in this column y += sizeBtn.y; @@ -476,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 - if ( (n + 1) % m_numCols ) + if ( (n + 1) % GetColumnCount() ) { // continue in this row x += sizeBtn.x; @@ -517,7 +507,7 @@ bool wxRadioBox::OnKeyDown(wxKeyEvent& event) break; default: - return FALSE; + return false; } int selOld = GetSelection(); @@ -530,8 +520,7 @@ bool wxRadioBox::OnKeyDown(wxKeyEvent& event) SendRadioEvent(); } - return TRUE; + return true; } #endif // wxUSE_RADIOBOX -