X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b06ac1f24a3e25aa88f813ac6d91452b907e993..ba1e9d6cede4073faf42e3e290a030965a2205c3:/include/wx/gtk1/radiobox.h diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h index d1c29dd7bd..bba9a528e2 100644 --- a/include/wx/gtk1/radiobox.h +++ b/include/wx/gtk1/radiobox.h @@ -1,17 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobox.h +// Name: wx/gtk/radiobox.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKRADIOBOXH__ #define __GTKRADIOBOXH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -41,8 +41,23 @@ public: Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name ); } + wxRadioBox(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + int majorDim = 1, + long style = wxRA_HORIZONTAL, + const wxValidator& val = wxDefaultValidator, + const wxString& name = wxRadioBoxNameStr) + { + Init(); - ~wxRadioBox(); + Create( parent, id, title, pos, size, choices, majorDim, style, val, name ); + } + + virtual ~wxRadioBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& title, @@ -54,6 +69,16 @@ public: long style = wxRA_HORIZONTAL, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); + bool Create(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + int majorDim = 0, + long style = wxRA_HORIZONTAL, + const wxValidator& val = wxDefaultValidator, + const wxString& name = wxRadioBoxNameStr); int FindString( const wxString& s) const; void SetSelection( int n ); @@ -81,10 +106,10 @@ public: #endif // WXWIN_COMPATIBILITY_2_2 // we have to override those to avoid virtual function name hiding - wxString GetLabel() const { return wxControl::GetLabel(); } - void SetLabel( const wxString& label ); - bool Show( bool show ); - bool Enable( bool enable ); + virtual wxString GetLabel() const { return wxControl::GetLabel(); } + virtual void SetLabel( const wxString& label ); + virtual bool Show( bool show = TRUE ); + virtual bool Enable( bool enable = TRUE ); // implementation // --------------