X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/gtk1/radiobox.h diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h index 217ac65f3d..8bbd932393 100644 --- a/include/wx/gtk1/radiobox.h +++ b/include/wx/gtk1/radiobox.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/radiobox.h +// Name: wx/gtk1/radiobox.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,8 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKRADIOBOXH__ -#define __GTKRADIOBOXH__ +#ifndef _WX_GTK_RADIOBOX_H_ +#define _WX_GTK_RADIOBOX_H_ #include "wx/bitmap.h" @@ -16,9 +16,11 @@ // wxRadioBox //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxRadioBox: public wxControl +class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, + public wxRadioBoxBase { public: + // ctors and dtor wxRadioBox() { Init(); } wxRadioBox(wxWindow *parent, wxWindowID id, @@ -28,7 +30,7 @@ public: int n = 0, const wxString choices[] = (const wxString *) NULL, int majorDim = 1, - long style = wxRA_HORIZONTAL, + long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr) { @@ -36,6 +38,7 @@ public: Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name ); } + wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title, @@ -43,7 +46,7 @@ public: const wxSize& size, const wxArrayString& choices, int majorDim = 1, - long style = wxRA_HORIZONTAL, + long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr) { @@ -52,7 +55,6 @@ public: Create( parent, id, title, pos, size, choices, majorDim, style, val, name ); } - virtual ~wxRadioBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& title, @@ -61,7 +63,7 @@ public: int n = 0, const wxString choices[] = (const wxString *) NULL, int majorDim = 0, - long style = wxRA_HORIZONTAL, + long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); bool Create(wxWindow *parent, @@ -71,38 +73,37 @@ public: const wxSize& size, const wxArrayString& choices, int majorDim = 0, - long style = wxRA_HORIZONTAL, + long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); - int FindString( const wxString& s) const; - void SetSelection( int n ); - int GetSelection() const; + virtual ~wxRadioBox(); - wxString GetString( int n ) const; - void SetString( int n, const wxString& label ); - virtual bool Show( int item, bool show = true ); - virtual bool Enable( int item, bool enable = true ); + // implement wxItemContainerImmutable methods + virtual unsigned int GetCount() const; - virtual wxString GetStringSelection() const; - virtual bool SetStringSelection( const wxString& s ); + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& s); - int GetCount() const; + virtual void SetSelection(int n); + virtual int GetSelection() const; - // for compatibility only, don't use these methods in new code! -#if WXWIN_COMPATIBILITY_2_2 - wxDEPRECATED( int Number() const ); - wxDEPRECATED( wxString GetLabel(int n) const ); - wxDEPRECATED( void SetLabel( int item, const wxString& label ) ); -#endif // WXWIN_COMPATIBILITY_2_2 - // we have to override those to avoid virtual function name hiding - virtual wxString GetLabel() const { return wxControl::GetLabel(); } - virtual void SetLabel( const wxString& label ); + // implement wxRadioBoxBase methods + virtual bool Show(unsigned int n, bool show = true); + virtual bool Enable(unsigned int n, bool enable = true); + + virtual bool IsItemEnabled(unsigned int n) const; + virtual bool IsItemShown(unsigned int n) const; + + + // override some base class methods to operate on radiobox itself too virtual bool Show( bool show = true ); virtual bool Enable( bool enable = true ); + virtual void SetLabel( const wxString& label ); + static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -122,19 +123,14 @@ public: bool m_hasFocus, m_lostFocus; - int m_majorDim; wxList m_boxes; protected: // common part of all ctors void Init(); - // check that the index is valid - // FIXME: remove once GTK will derive from wxRadioBoxBase - inline bool IsValid(int n) const { return n >= 0 && n < GetCount(); } - private: DECLARE_DYNAMIC_CLASS(wxRadioBox) }; -#endif // __GTKRADIOBOXH__ +#endif // _WX_GTK_RADIOBOX_H_