X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa50c0e3bfe333bf527177ada29fe24fbc6f6353..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/univ/radiobox.h diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h index 67cf04bc1e..94830801a9 100644 --- a/include/wx/univ/radiobox.h +++ b/include/wx/univ/radiobox.h @@ -12,11 +12,7 @@ #ifndef _WX_UNIV_RADIOBOX_H_ #define _WX_UNIV_RADIOBOX_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univradiobox.h" -#endif - -class WXDLLEXPORT wxRadioButton; +class WXDLLIMPEXP_FWD_CORE wxRadioButton; #include "wx/statbox.h" #include "wx/dynarray.h" @@ -88,15 +84,17 @@ public: virtual void SetSelection(int n); virtual int GetSelection() const; - virtual int GetCount() const { return m_buttons.GetCount(); } - virtual int GetColumnCount() const { return m_numCols; } - virtual int GetRowCount() const { return m_numRows; } + virtual unsigned int GetCount() const + { return (unsigned int)m_buttons.GetCount(); } + + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& label); - virtual wxString GetString(int n) const; - virtual void SetString(int n, const wxString& label); + virtual bool Enable(unsigned int n, bool enable = true); + virtual bool Show(unsigned int n, bool show = true); - virtual bool Enable(int n, bool enable = true); - virtual bool Show(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); @@ -104,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 ); @@ -132,24 +131,12 @@ protected: // common part of all ctors void Init(); - // sets m_majorDim and calculate m_numCols and m_numRows - void SetMajorDim(int majorDim); - // calculate the max size of all buttons wxSize GetMaxButtonSize() const; // the currently selected radio button or -1 int m_selection; - // the parameters defining the button layout: majorDim meaning depends on - // the style and is the (max) number of columns if it includes - // wxRA_SPECIFY_COLS and is the (max) number of rows if it includes - // wxRA_SPECIFY_ROWS - the number of rows and columns is calculated from - // it - int m_majorDim, - m_numCols, - m_numRows; - // all radio buttons wxArrayRadioButtons m_buttons;