X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cf73271dd6f442a98e86b559d4a55c37e25b99f..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/mac/carbon/radiobox.h diff --git a/include/wx/mac/carbon/radiobox.h b/include/wx/mac/carbon/radiobox.h index c9642e2deb..ac0747ff24 100644 --- a/include/wx/mac/carbon/radiobox.h +++ b/include/wx/mac/carbon/radiobox.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobox.h +// Name: wx/mac/carbon/radiobox.h // Purpose: wxRadioBox class // Author: Stefan Csomor // Modified by: @@ -12,16 +12,12 @@ #ifndef _WX_RADIOBOX_H_ #define _WX_RADIOBOX_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "radiobox.h" -#endif - // List box item -class WXDLLEXPORT wxBitmap ; +class WXDLLIMPEXP_FWD_CORE wxBitmap ; -class WXDLLEXPORT wxRadioButton ; +class WXDLLIMPEXP_FWD_CORE wxRadioButton ; -class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase +class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase { DECLARE_DYNAMIC_CLASS(wxRadioBox) public: @@ -45,7 +41,7 @@ public: Create(parent, id, title, pos, size, choices, majorDim, style, val, name); } - ~wxRadioBox(); + virtual ~wxRadioBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, @@ -58,28 +54,29 @@ public: const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); -// Specific functions (in wxWindows2 reference) - virtual void SetSelection(int item); - virtual int GetSelection() const; - - inline virtual int GetCount() const { return m_noItems; } ; + // Enabling + virtual bool Enable(bool enable = true); + virtual bool Enable(unsigned int item, bool enable = true); + virtual bool IsItemEnabled(unsigned int item) const; - virtual wxString GetString(int item) const; - virtual void SetString(int item, const wxString& label) ; + // Showing + virtual bool Show(bool show = true); + virtual bool Show(unsigned int item, bool show = true); + virtual bool IsItemShown(unsigned int item) const; - virtual void Enable(int item, bool enable); - virtual void Show(int item, bool show) ; + // Specific functions (in wxWidgets2 reference) + virtual void SetSelection(int item); + virtual int GetSelection() const; - virtual int GetColumnCount() const ; - virtual int GetRowCount() const ; + virtual unsigned int GetCount() const { return m_noItems; } + virtual wxString GetString(unsigned int item) const; + virtual void SetString(unsigned int item, const wxString& label); - virtual bool Enable(bool enable = TRUE); virtual wxString GetLabel() const; virtual void SetLabel(const wxString& label) ; - virtual bool Show(bool show = TRUE); -// Other external functions +// Other external functions void Command(wxCommandEvent& event); void SetFocus(); @@ -88,14 +85,14 @@ public: inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; } void OnRadioButton( wxCommandEvent& event ) ; + protected: - wxRadioButton *m_radioButtonCycle; + wxRadioButton *m_radioButtonCycle; - int m_majorDim ; - int m_noItems; + unsigned int m_noItems; int m_noRowsOrCols; -// Internal functions +// Internal functions virtual wxSize DoGetBestSize() const ; virtual void DoSetSize(int x, int y, int width, int height,