X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/univ/radiobox.h?ds=sidebyside diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h index 163d4627e4..67cf04bc1e 100644 --- a/include/wx/univ/radiobox.h +++ b/include/wx/univ/radiobox.h @@ -6,7 +6,7 @@ // Created: 11.09.00 // RCS-ID: $Id$ // Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_UNIV_RADIOBOX_H_ @@ -95,15 +95,18 @@ public: virtual wxString GetString(int n) const; virtual void SetString(int n, const wxString& label); - virtual void Enable(int n, bool enable = TRUE); - virtual void Show(int n, bool show = TRUE); + virtual bool Enable(int n, bool enable = true); + virtual bool Show(int n, bool show = true); // we also override the wxControl methods to avoid virtual function hiding - virtual bool Enable(bool enable = TRUE); - virtual bool Show(bool show = TRUE); + virtual bool Enable(bool enable = true); + virtual bool Show(bool show = true); virtual wxString GetLabel() const; virtual void SetLabel(const wxString& label); + // we inherit a version returning false from wxStaticBox, override it again + virtual bool AcceptsFocus() const { return true; } + #if wxUSE_TOOLTIPS virtual void DoSetToolTip( wxToolTip *tip ); #endif // wxUSE_TOOLTIPS @@ -129,9 +132,6 @@ protected: // common part of all ctors void Init(); - // check that the index is valid - bool IsValid(int n) const { return n >= 0 && n < GetCount(); } - // sets m_majorDim and calculate m_numCols and m_numRows void SetMajorDim(int majorDim);