Common code for the same handling of wxSL_INVERSE.

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

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index fa3db009e4f064f1c3ac0f94f88baa30e3009457..3a366c994386ca4cbdb48a560113179400fc0995 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -18,7 +18,7 @@
 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 

-#include "wx/control.h"
+#include "wx/ctrlsub.h"

 
 extern WXDLLEXPORT_DATA(const wxChar*) wxRadioBoxNameStr;
 
 
 extern WXDLLEXPORT_DATA(const wxChar*) wxRadioBoxNameStr;
 


@@ -28,53 +28,9 @@ extern WXDLLEXPORT_DATA(const wxChar*) wxRadioBoxNameStr;
 // example, it is a wxStaticBox in wxUniv and wxMSW but not in other ports
 // ----------------------------------------------------------------------------
 
 // example, it is a wxStaticBox in wxUniv and wxMSW but not in other ports
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxRadioBoxBase
+class WXDLLEXPORT wxRadioBoxBase : public wxItemContainerImmutable

 {
 public:
 {
 public:

-    // selection
-    virtual void SetSelection(int n) = 0;
-    virtual int GetSelection() const = 0;
-
-    virtual wxString GetStringSelection() const
-    {
-        wxString s;
-        int sel = GetSelection();
-        if ( sel != wxNOT_FOUND )
-            s = GetString(sel);
-
-        return s;
-    }
-
-    virtual bool SetStringSelection(const wxString& s)
-    {
-        int sel = FindString(s);
-        if ( sel != wxNOT_FOUND )
-        {
-            SetSelection(sel);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    // string access
-    virtual int GetCount() const = 0;
-    virtual int FindString(const wxString& s) const
-    {
-        int count = GetCount();
-        for ( int n = 0; n < count; n++ )
-        {
-            if ( GetString(n) == s )
-                return n;
-        }
-
-        return wxNOT_FOUND;
-    }
-
-    virtual wxString GetString(int n) const = 0;
-    virtual void SetString(int n, const wxString& label) = 0;
-

     // change the individual radio button state
     virtual void Enable(int n, bool enable = true) = 0;
     virtual void Show(int n, bool show = true) = 0;
     // change the individual radio button state
     virtual void Enable(int n, bool enable = true) = 0;
     virtual void Show(int n, bool show = true) = 0;


@@ -87,6 +43,9 @@ public:
     int GetNextItem(int item, wxDirection dir, long style) const;
 
 
     int GetNextItem(int item, wxDirection dir, long style) const;
 
 

+    // implement some of wxItemContainerImmutable functions
+    virtual int FindString(const wxString& s) const;
+

     // deprecated functions
     // --------------------
 
     // deprecated functions
     // --------------------
 


@@ -117,6 +76,8 @@ public:
     #include "wx/cocoa/radiobox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/radiobox.h"
     #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
 #endif
 
 #endif // wxUSE_RADIOBOX