X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96be256b3e1802de10f45953c41ed33bce399b54..7cee4f76216597fafeddb725f93b1ac7fd7685f0:/include/wx/motif/radiobox.h?ds=sidebyside diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h index 91f84f1557..9b131fcb77 100644 --- a/include/wx/motif/radiobox.h +++ b/include/wx/motif/radiobox.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobox.h +// Name: wx/motif/radiobox.h // Purpose: wxRadioBox class // Author: Julian Smart // Modified by: @@ -9,26 +9,20 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_RADIOBOX_H_ -#define _WX_RADIOBOX_H_ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "radiobox.h" -#endif +#ifndef _WX_MOTIF_RADIOBOX_H_ +#define _WX_MOTIF_RADIOBOX_H_ #ifndef wxWIDGET_ARRAY_DEFINED #define wxWIDGET_ARRAY_DEFINED #include "wx/dynarray.h" - WX_DEFINE_ARRAY(WXWidget, wxWidgetArray); -#endif + WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray); +#endif // wxWIDGET_ARRAY_DEFINED #include "wx/arrstr.h" -class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase +class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase { - DECLARE_DYNAMIC_CLASS(wxRadioBox) - public: wxRadioBox() { Init(); } @@ -36,7 +30,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, - int majorDim = 0, long style = wxRA_HORIZONTAL, + int majorDim = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr) { @@ -50,7 +44,7 @@ public: const wxPoint& pos, const wxSize& size, const wxArrayString& choices, - int majorDim = 0, long style = wxRA_HORIZONTAL, + int majorDim = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr) { @@ -60,13 +54,13 @@ public: 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, - int majorDim = 0, long style = wxRA_HORIZONTAL, + int majorDim = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); @@ -74,29 +68,39 @@ public: const wxPoint& pos, const wxSize& size, const wxArrayString& choices, - int majorDim = 0, long style = wxRA_HORIZONTAL, + int majorDim = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); - int FindString(const wxString& s) const; - void SetSelection(int N); + // 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; + } + + virtual void SetSelection(int n); int GetSelection() const; - void SetString(int item, const wxString& label) ; - wxString GetString(int item) const; - virtual bool Enable(bool enable = true); - void Enable(int item, bool enable); - void Show(int item, bool show) ; - virtual bool Show(bool show = true) ; + virtual void SetString(unsigned int item, const wxString& label); + virtual wxString GetString(unsigned int item) const; virtual wxString GetStringSelection() const; virtual bool SetStringSelection(const wxString& s); - virtual int GetCount() const { return m_noItems; } ; + virtual unsigned int GetCount() const { return m_noItems; } ; void Command(wxCommandEvent& event); - int GetColumnCount() const; - int GetRowCount() const; - int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; } void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; } @@ -108,12 +112,13 @@ public: void SetSel(int i) { m_selectedButton = i; } virtual WXWidget GetLabelWidget() const { return m_labelWidget; } -private: - void Init(); - protected: - int m_majorDim; - int m_noItems; + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO); + + unsigned int m_noItems; int m_noRowsOrCols; int m_selectedButton; @@ -121,10 +126,10 @@ protected: WXWidget m_labelWidget; wxArrayString m_radioButtonLabels; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); +private: + void Init(); + + DECLARE_DYNAMIC_CLASS(wxRadioBox) }; -#endif -// _WX_RADIOBOX_H_ +#endif // _WX_MOTIF_RADIOBOX_H_