X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a87edf286921de9b182f3d19adb6bb63ba85ebd..579e055907e6cc5aa25f9a8fa90b952d8a58159c:/include/wx/motif/radiobox.h diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h index a37b8f6628..7217192aba 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: @@ -12,10 +12,6 @@ #ifndef _WX_MOTIF_RADIOBOX_H_ #define _WX_MOTIF_RADIOBOX_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "radiobox.h" -#endif - #ifndef wxWIDGET_ARRAY_DEFINED #define wxWIDGET_ARRAY_DEFINED @@ -25,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(); } @@ -58,7 +54,7 @@ public: majorDim, style, val, name); } - ~wxRadioBox(); + virtual ~wxRadioBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -76,25 +72,35 @@ public: 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); - virtual bool Enable(int item, bool enable = true); - 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; } @@ -107,12 +113,12 @@ 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); - int m_majorDim; - int m_noItems; + unsigned int m_noItems; int m_noRowsOrCols; int m_selectedButton; @@ -127,4 +133,3 @@ private: }; #endif // _WX_MOTIF_RADIOBOX_H_ -