X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/common/radiocmn.cpp diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp index c732658d75..47f15e5b2c 100644 --- a/src/common/radiocmn.cpp +++ b/src/common/radiocmn.cpp @@ -38,6 +38,18 @@ // implementation // ============================================================================ +int wxRadioBoxBase::FindString(const wxString& s) const +{ + int count = GetCount(); + for ( int n = 0; n < count; n++ ) + { + if ( GetString(n) == s ) + return n; + } + + return wxNOT_FOUND; +} + int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const { int count = GetCount(), @@ -98,7 +110,7 @@ int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const default: wxFAIL_MSG( _T("unexpected wxDirection value") ); - return -1; + return wxNOT_FOUND; } // ensure that the item is in range [0..count) @@ -134,5 +146,38 @@ int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const return item; } +#if WXWIN_COMPATIBILITY_2_4 + +// these functions are deprecated and don't do anything +int wxRadioBoxBase::GetNumberOfRowsOrCols() const +{ + return 1; +} + +void wxRadioBoxBase::SetNumberOfRowsOrCols(int WXUNUSED(n)) +{ +} + +#endif // WXWIN_COMPATIBILITY_2_4 + +#if WXWIN_COMPATIBILITY_2_2 + +int wxRadioBoxBase::Number() const +{ + return GetCount(); +} + +wxString wxRadioBoxBase::GetLabel(int n) const +{ + return GetString(n); +} + +void wxRadioBoxBase::SetLabel(int n, const wxString& label) +{ + SetString(n, label); +} + +#endif // WXWIN_COMPATIBILITY_2_2 + #endif // wxUSE_RADIOBOX