X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c8531822d586a7e1875e94383f13f38b00c2437a..2d9c0e97c580cff977d75760dc0d82c5852eec2c:/include/wx/gtk/radiobox.h diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h index a871b7085d..97a318bdcd 100644 --- a/include/wx/gtk/radiobox.h +++ b/include/wx/gtk/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(__APPLE__) #pragma interface #endif @@ -42,7 +42,7 @@ public: Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name ); } - ~wxRadioBox(); + virtual ~wxRadioBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& title, @@ -60,7 +60,7 @@ public: int GetSelection() const; wxString GetString( int n ) const; - void SetLabel( const wxString& label ); + void SetString( int n, const wxString& label ); void Show( int item, bool show ); void Enable( int item, bool enable ); @@ -76,13 +76,15 @@ public: #if WXWIN_COMPATIBILITY_2_2 int Number() const { return GetCount(); } wxString GetLabel(int n) const { return GetString(n); } - void SetLabel( int item, const wxString& label ); + void SetLabel( int item, const wxString& label ) + { SetString(item, label); } #endif // WXWIN_COMPATIBILITY_2_2 // we have to override those to avoid virtual function name hiding - wxString GetLabel() const { return wxControl::GetLabel(); } - 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 // --------------