Applied [ 586524 ] wxVariant Enhancements.

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

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index 591f88e21c4d398c393969b3d2d52a83e0fbffce..0715c8fde92934ddfe28f5c14d909d653d4ab4f2 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -23,7 +23,7 @@ WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
 // List box item
 class WXDLLEXPORT wxBitmap ;
 
-class WXDLLEXPORT wxRadioBox : public wxControl
+class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
 {
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 
@@ -50,12 +50,9 @@ public:
     int FindString(const wxString& s) const;
     void SetSelection(int N);
     int GetSelection() const;
-    wxString GetString(int N) const;
 
-    void SetLabel(const wxString& label) { wxControl::SetLabel(label); };
-    void SetLabel(int item, const wxString& label) ;
-    wxString GetLabel(int item) const;
-    wxString GetLabel() const { return wxControl::GetLabel(); };
+    void SetString(int item, const wxString& label) ;
+    wxString GetString(int item) const;
     virtual bool Enable(bool enable = TRUE);
     void Enable(int item, bool enable);
     void Show(int item, bool show) ;
@@ -66,6 +63,9 @@ public:
     virtual int GetCount() const { return m_noItems; } ;
     void Command(wxCommandEvent& event);
 
+    int GetColumnCount() const;
+    int GetRowCount() const;
+
     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
     void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }