X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a87edf286921de9b182f3d19adb6bb63ba85ebd..81853b98619293be66074d74d2557973c0f3ab21:/include/wx/mac/carbon/radiobox.h diff --git a/include/wx/mac/carbon/radiobox.h b/include/wx/mac/carbon/radiobox.h index 663b8126c0..fddba3c722 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,10 +12,6 @@ #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 ; @@ -58,26 +54,35 @@ public: const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); -// Specific functions (in wxWidgets2 reference) + // Enabling + virtual bool Enable(bool enable = true); + virtual bool Enable(unsigned int item, bool enable = true); + virtual bool IsItemEnabled(unsigned int WXUNUSED(n)) const + { + /* TODO */ + return true; + } + + // Showing + virtual bool Show(bool show = true); + virtual bool Show(unsigned int item, bool show = true); + virtual bool IsItemShown(unsigned int WXUNUSED(n)) const + { + /* TODO */ + return true; + } + + // Specific functions (in wxWidgets2 reference) virtual void SetSelection(int item); virtual int GetSelection() const; - inline virtual int GetCount() const { return m_noItems; } ; - - virtual wxString GetString(int item) const; - virtual void SetString(int item, const wxString& label) ; + virtual unsigned int GetCount() const { return m_noItems; } - virtual bool Enable(int item, bool enable = true); - virtual void Show(int item, bool show) ; + virtual wxString GetString(unsigned int item) const; + virtual void SetString(unsigned int item, const wxString& label); - virtual int GetColumnCount() const ; - virtual int GetRowCount() const ; - - - 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 void Command(wxCommandEvent& event); @@ -88,11 +93,11 @@ 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