we need our own imaglist implementation because in wxmac wxIcon does not inherit...

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

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 1fea3e7526caa291eb4bf333ebb2c07afbfbcb5e..25fc92c152aeb5c72cf9467ffb038c3a3d3542b0 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -18,66 +18,22 @@
 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 

-#include "wx/control.h"
+#include "wx/ctrlsub.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
 
 // ----------------------------------------------------------------------------
 // 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
+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
     // change the individual radio button state

-    virtual void Enable(int n, bool enable = true) = 0;
-    virtual void Show(int n, bool show = true) = 0;
+    virtual bool Enable(int n, bool enable = true) = 0;
+    virtual bool Show(int n, bool show = true) = 0;

 
     // layout parameters
     virtual int GetColumnCount() const = 0;
 
     // layout parameters
     virtual int GetColumnCount() const = 0;


@@ -86,11 +42,23 @@ public:
     // return the item above/below/to the left/right of the given one
     int GetNextItem(int item, wxDirection dir, long style) const;
 
     // return the item above/below/to the left/right of the given one
     int GetNextItem(int item, wxDirection dir, long style) const;
 

+
+    // implement some of wxItemContainerImmutable functions
+    virtual int FindString(const wxString& s) const;
+
+    // deprecated functions
+    // --------------------
+
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( int GetNumberOfRowsOrCols() const );
+    wxDEPRECATED( void SetNumberOfRowsOrCols(int n) );
+#endif // WXWIN_COMPATIBILITY_2_4
+

     // for compatibility only, don't use these methods in new code!
 #if WXWIN_COMPATIBILITY_2_2
     // 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
 };
 
 #endif // WXWIN_COMPATIBILITY_2_2
 };
 


@@ -108,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