compilation fixes after the last commit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index a871b7085dc1578c1d120f0382edc2079f546292..d1c29dd7bde5a195fb65ec7fc8ede4657b21b50e 100644 (file)
--- 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 a871b7085dc1578c1d120f0382edc2079f546292..d1c29dd7bde5a195fb65ec7fc8ede4657b21b50e 100644 (file)
--- 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 0b6045cd3ca24df15c70bd33342aec6abf9b50cb..594cf793f8be79983a956f5f53588bef5fa8c888 100644 (file)
--- 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 0b6045cd3ca24df15c70bd33342aec6abf9b50cb..594cf793f8be79983a956f5f53588bef5fa8c888 100644 (file)
--- 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") );