X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21e0a4d5f15ea1df40d29359fc1e84085936ef3f..e4161a2a08e622ba55f66610e26892f5fda37e6f:/include/wx/univ/radiobox.h diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h index 7cb1bb7888..94830801a9 100644 --- a/include/wx/univ/radiobox.h +++ b/include/wx/univ/radiobox.h @@ -12,7 +12,7 @@ #ifndef _WX_UNIV_RADIOBOX_H_ #define _WX_UNIV_RADIOBOX_H_ -class WXDLLEXPORT wxRadioButton; +class WXDLLIMPEXP_FWD_CORE wxRadioButton; #include "wx/statbox.h" #include "wx/dynarray.h" @@ -84,13 +84,17 @@ public: virtual void SetSelection(int n); virtual int GetSelection() const; - virtual int GetCount() const { return (int) m_buttons.GetCount(); } + virtual unsigned int GetCount() const + { return (unsigned int)m_buttons.GetCount(); } - virtual wxString GetString(int n) const; - virtual void SetString(int n, const wxString& label); + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& label); - virtual bool Enable(int n, bool enable = true); - virtual bool Show(int n, bool show = true); + virtual bool Enable(unsigned int n, bool enable = true); + virtual bool Show(unsigned int n, bool show = true); + + virtual bool IsItemEnabled(unsigned int n) const; + virtual bool IsItemShown(unsigned int n) const; // we also override the wxControl methods to avoid virtual function hiding virtual bool Enable(bool enable = true); @@ -98,8 +102,9 @@ public: 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; } + // we inherit a version always returning false from wxStaticBox, override + // it to behave normally + virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); } #if wxUSE_TOOLTIPS virtual void DoSetToolTip( wxToolTip *tip );