removed multiple duplicate copies (with subtly different behaviour) of SetStringSelec...

[wxWidgets.git] / include / wx / radiobox.h

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 529f4bc17f896f4ea6dd9badcf708a812ca0babf..3cf0635cfe4fcd7c071386e8ab1874155ee3537b 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -20,12 +20,12 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxRadioBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxRadioBoxNameStr;
 
 // ----------------------------------------------------------------------------
 // wxRadioBoxBase is not a normal base class, but rather a mix-in because the
 // real wxRadioBox derives from different classes on different platforms: for
-// example, it is a wxStaticBox in wxUniv but not in wxMSW
+// example, it is a wxStaticBox in wxUniv and wxMSW but not in other ports
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxRadioBoxBase
@@ -97,9 +97,9 @@ public:
 
     // 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 n, const wxString& label) { SetString(n, label); }
+    wxDEPRECATED( int Number() const );
+    wxDEPRECATED( wxString GetLabel(int n) const );
+    wxDEPRECATED( void SetLabel(int n, const wxString& label) );
 #endif // WXWIN_COMPATIBILITY_2_2
 };
 
@@ -117,6 +117,8 @@ public:
     #include "wx/cocoa/radiobox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/radiobox.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/radiobox.h"
 #endif
 
 #endif // wxUSE_RADIOBOX