X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa61d3525370a9b9fa8c797d9b7f89d96994db5f..75ded4d17344618afd302a0671f1277791ee17ed:/include/wx/motif/radiobox.h?ds=inline diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h index f85602f8f8..9b131fcb77 100644 --- a/include/wx/motif/radiobox.h +++ b/include/wx/motif/radiobox.h @@ -21,7 +21,7 @@ #include "wx/arrstr.h" -class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase +class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase { public: wxRadioBox() { Init(); } @@ -30,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) { @@ -44,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) { @@ -54,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); @@ -68,19 +68,33 @@ 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); + // 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; virtual void SetString(unsigned int item, const wxString& label); virtual wxString GetString(unsigned int item) const; - virtual bool Enable(bool enable = true); - virtual bool Enable(unsigned int item, bool enable = true); - virtual bool Show(unsigned int item, bool show = true); - virtual bool Show(bool show = true); virtual wxString GetStringSelection() const; virtual bool SetStringSelection(const wxString& s); @@ -99,6 +113,7 @@ public: virtual WXWidget GetLabelWidget() const { return m_labelWidget; } protected: + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);