X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1395ff56f4a8dd0fa400abc0faecc281c304caf7..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/mac/radiobox.h diff --git a/include/wx/mac/radiobox.h b/include/wx/mac/radiobox.h index 23536ff245..665635334b 100644 --- a/include/wx/mac/radiobox.h +++ b/include/wx/mac/radiobox.h @@ -16,16 +16,12 @@ #pragma interface "radiobox.h" #endif -#include "wx/control.h" - -WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr; - // List box item class WXDLLEXPORT wxBitmap ; class WXDLLEXPORT wxRadioButton ; -class WXDLLEXPORT wxRadioBox: public wxControl +class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase { DECLARE_DYNAMIC_CLASS(wxRadioBox) public: @@ -47,21 +43,25 @@ public: const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); // Specific functions (in wxWindows2 reference) - void Enable(bool enable); - void Enable(int item, bool enable); - int FindString(const wxString& s) const; + 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 void Enable(int item, bool enable); + virtual void Show(int item, bool show) ; + + virtual int GetColumnCount() const ; + virtual int GetRowCount() const ; + + + bool Enable(bool enable); wxString GetLabel() const; - wxString GetLabel(int item) const; - int GetSelection() const; - wxString GetString(int item) const; - virtual wxString GetStringSelection() const; - inline virtual int Number() const { return m_noItems; } ; void SetLabel(const wxString& label) ; - void SetLabel(int item, const wxString& label) ; - void SetSelection(int item); - virtual bool SetStringSelection(const wxString& s); bool Show(bool show); - void Show(int item, bool show) ; // Other external functions void Command(wxCommandEvent& event); @@ -71,6 +71,7 @@ public: inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; } inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; } + void OnRadioButton( wxCommandEvent& event ) ; protected: wxRadioButton *m_radioButtonCycle; @@ -82,9 +83,8 @@ protected: virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - int GetNumHor() const; - int GetNumVer() const; + DECLARE_EVENT_TABLE() }; #endif