From c8531822d586a7e1875e94383f13f38b00c2437a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 Feb 2002 22:45:08 +0000
Subject: [PATCH] added SetString(), deprecated SetLabel()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/gtk/radiobox.h  | 43 +++++++++++++++++++-------------------
 include/wx/gtk1/radiobox.h | 43 +++++++++++++++++++-------------------
 2 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h
index 6ecfc59a17..a871b7085d 100644
--- a/include/wx/gtk/radiobox.h
+++ b/include/wx/gtk/radiobox.h
@@ -34,7 +34,7 @@ public:
                const wxString choices[] = (const wxString *) NULL,
                int majorDim = 1,
                long style = wxRA_HORIZONTAL,
-               const wxValidator& val = wxDefaultValidator, 
+               const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
         Init();
@@ -52,40 +52,41 @@ public:
                 const wxString choices[] = (const wxString *) NULL,
                 int majorDim = 0,
                 long style = wxRA_HORIZONTAL,
-                const wxValidator& val = wxDefaultValidator, 
+                const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
     int FindString( const wxString& s) const;
     void SetSelection( int n );
     int GetSelection() const;
-    
+
     wxString GetString( int n ) const;
-    
-    wxString GetLabel( int item ) const;
-    wxString GetLabel() const { return wxControl::GetLabel(); }
     void SetLabel( const wxString& label );
-    void SetLabel( int item, const wxString& label );
-    
-    /* doesn't work */
-    void SetLabel( int item, wxBitmap *bitmap );
-    
-    bool Show( bool show );
+
     void Show( int item, bool show );
-    
-    bool Enable( bool enable );
     void Enable( int item, bool enable );
-    
+
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection( const wxString& s );
-    
-    int Number() const;
-    int GetCount() const { return Number(); }
+
+    int GetCount() const;
     int GetNumberOfRowsOrCols() const;
     void SetNumberOfRowsOrCols( int n );
-    
+
+    // for compatibility only, don't use these methods in new code!
+#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 );
+#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 );
+
     // implementation
     // --------------
-    
+
     void SetFocus();
     void GtkDisableEvents();
     void GtkEnableEvents();
@@ -98,7 +99,7 @@ public:
 
     virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
     virtual void OnInternalIdle();
-    
+
     bool             m_hasFocus,
                      m_lostFocus;
     int              m_majorDim;
diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index 6ecfc59a17..a871b7085d 100644
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -34,7 +34,7 @@ public:
                const wxString choices[] = (const wxString *) NULL,
                int majorDim = 1,
                long style = wxRA_HORIZONTAL,
-               const wxValidator& val = wxDefaultValidator, 
+               const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
         Init();
@@ -52,40 +52,41 @@ public:
                 const wxString choices[] = (const wxString *) NULL,
                 int majorDim = 0,
                 long style = wxRA_HORIZONTAL,
-                const wxValidator& val = wxDefaultValidator, 
+                const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
     int FindString( const wxString& s) const;
     void SetSelection( int n );
     int GetSelection() const;
-    
+
     wxString GetString( int n ) const;
-    
-    wxString GetLabel( int item ) const;
-    wxString GetLabel() const { return wxControl::GetLabel(); }
     void SetLabel( const wxString& label );
-    void SetLabel( int item, const wxString& label );
-    
-    /* doesn't work */
-    void SetLabel( int item, wxBitmap *bitmap );
-    
-    bool Show( bool show );
+
     void Show( int item, bool show );
-    
-    bool Enable( bool enable );
     void Enable( int item, bool enable );
-    
+
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection( const wxString& s );
-    
-    int Number() const;
-    int GetCount() const { return Number(); }
+
+    int GetCount() const;
     int GetNumberOfRowsOrCols() const;
     void SetNumberOfRowsOrCols( int n );
-    
+
+    // for compatibility only, don't use these methods in new code!
+#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 );
+#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 );
+
     // implementation
     // --------------
-    
+
     void SetFocus();
     void GtkDisableEvents();
     void GtkEnableEvents();
@@ -98,7 +99,7 @@ public:
 
     virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
     virtual void OnInternalIdle();
-    
+
     bool             m_hasFocus,
                      m_lostFocus;
     int              m_majorDim;