From 0b06ac1f24a3e25aa88f813ac6d91452b907e993 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 17 Feb 2002 22:53:41 +0000 Subject: [PATCH] compilation fixes after the last commit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/radiobox.h | 6 ++++-- include/wx/gtk1/radiobox.h | 6 ++++-- src/gtk/radiobox.cpp | 7 ------- src/gtk1/radiobox.cpp | 7 ------- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h index a871b7085d..d1c29dd7bd 100644 --- a/include/wx/gtk/radiobox.h +++ b/include/wx/gtk/radiobox.h @@ -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,11 +76,13 @@ 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(); } + void SetLabel( const wxString& label ); bool Show( bool show ); bool Enable( bool enable ); diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h index a871b7085d..d1c29dd7bd 100644 --- a/include/wx/gtk1/radiobox.h +++ b/include/wx/gtk1/radiobox.h @@ -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,11 +76,13 @@ 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(); } + void SetLabel( const wxString& label ); bool Show( bool show ); bool Enable( bool enable ); diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 0b6045cd3c..594cf793f8 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -510,13 +510,6 @@ wxString wxRadioBox::GetString( int n ) const return wxString( label->label ); } -wxString wxRadioBox::GetLabel( int item ) const -{ - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") ); - - return GetString( item ); -} - void wxRadioBox::SetLabel( const wxString& label ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") ); diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index 0b6045cd3c..594cf793f8 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -510,13 +510,6 @@ wxString wxRadioBox::GetString( int n ) const return wxString( label->label ); } -wxString wxRadioBox::GetLabel( int item ) const -{ - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid radiobox") ); - - return GetString( item ); -} - void wxRadioBox::SetLabel( const wxString& label ) { wxCHECK_RET( m_widget != NULL, wxT("invalid radiobox") );