Bitmap button updates

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

diff --git a/include/wx/mac/radiobox.h b/include/wx/mac/radiobox.h
index 23536ff245fd2ccc7d43031f3e62d190907cb1b3..5e0f3644e07d87d388c9f0d2e42e4f6553b7bb45 100644 (file)
--- a/include/wx/mac/radiobox.h
+++ b/include/wx/mac/radiobox.h
@@ -12,20 +12,16 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "radiobox.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
-
 // List box item
 class WXDLLEXPORT wxBitmap ;
 
 class WXDLLEXPORT wxRadioButton ;
 
-class WXDLLEXPORT wxRadioBox: public wxControl
+class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase
 {
        DECLARE_DYNAMIC_CLASS(wxRadioBox)
 public:
@@ -47,21 +43,25 @@ public:
              const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
 
 // Specific functions (in wxWindows2 reference)
-       void Enable(bool enable);
-       void Enable(int item, bool enable);
-       int FindString(const wxString& s) const;
-       wxString GetLabel() const;
-       wxString GetLabel(int item) const;
-       int GetSelection() const;
-       wxString GetString(int item) const;
-       virtual wxString GetStringSelection() const;
-       inline virtual int Number() const { return m_noItems; } ;
-       void SetLabel(const wxString& label) ;
-       void SetLabel(int item, const wxString& label) ;
-       void SetSelection(int item);
-       virtual bool SetStringSelection(const wxString& s);
-       bool Show(bool show);
-       void Show(int item, bool show) ;
+       virtual void SetSelection(int item);
+       virtual int GetSelection() const;
+       
+       inline virtual int GetCount() const { return m_noItems; } ;
+
+       virtual wxString GetString(int item) const;
+       virtual void SetString(int item, const wxString& label) ;
+       
+       virtual void Enable(int item, bool enable);
+       virtual void Show(int item, bool show) ;
+
+    virtual int GetColumnCount() const ;
+    virtual int GetRowCount() const ;
+
+
+       virtual bool Enable(bool enable = TRUE);
+       virtual wxString GetLabel() const;
+       virtual void SetLabel(const wxString& label) ;
+       virtual bool Show(bool show = TRUE);
 
 // Other external functions 
        void Command(wxCommandEvent& event);
@@ -71,6 +71,7 @@ public:
        inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
        inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
+       void OnRadioButton( wxCommandEvent& event ) ;
 protected:
        wxRadioButton           *m_radioButtonCycle;
        
@@ -79,12 +80,12 @@ protected:
        int               m_noRowsOrCols;
 
 // Internal functions 
+    virtual wxSize DoGetBestSize() const ;
        virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
-       int GetNumHor() const;
-       int GetNumVer() const;
 
+    DECLARE_EVENT_TABLE()
 };
 
 #endif