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 8a4529edca4f1708aa657b5cc5c6cdd96e4e3cf7..5e0f3644e07d87d388c9f0d2e42e4f6553b7bb45 100644 (file)
--- a/include/wx/mac/radiobox.h
+++ b/include/wx/mac/radiobox.h
@@ -12,101 +12,80 @@
 #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 wxRadioBox: public wxControl
-{
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+class WXDLLEXPORT wxRadioButton ;
 
+class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase
+{
+       DECLARE_DYNAMIC_CLASS(wxRadioBox)
 public:
-    wxRadioBox();
-
-    wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
-            const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            int majorDim = 0, long style = wxRA_HORIZONTAL,
-            const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
-    {
-        Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
-    }
-
-    ~wxRadioBox();
-
-    bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
-            const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            int majorDim = 0, long style = wxRA_HORIZONTAL,
-            const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
-
-    int FindString(const wxString& s) const;
-    void SetSelection(int N);
-    int GetSelection() const;
-    wxString GetString(int N) const;
-
-    void GetSize(int *x, int *y) const;
-    void GetPosition(int *x, int *y) const;
-
-    void SetLabel(int item, const wxString& label);
-    void SetLabel(int item, wxBitmap *bitmap);
-    wxString GetLabel(int item) const;
-    bool Show(bool show);
-    void SetFocus();
-    bool Enable(bool enable);
-    void Enable(int item, bool enable);
-    void Show(int item, bool show);
-    void SetLabelFont(const wxFont& WXUNUSED(font)) {};
-    void SetButtonFont(const wxFont& font) { SetFont(font); }
-
-    virtual wxString GetStringSelection() const;
-    virtual bool SetStringSelection(const wxString& s);
-    virtual int Number() const { return m_noItems; };
-    void Command(wxCommandEvent& event);
-
-    int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
-    void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
-
-    // implementation only from now on
-    // -------------------------------
-
-    WXHWND *GetRadioButtons() const { return m_radioButtons; }
-    bool ContainsHWND(WXHWND hWnd) const;
-    void SendNotificationEvent();
-
-    // get the number of buttons per column/row
-    int GetNumVer() const;
-    int GetNumHor() const;
-
-#if WXWIN_COMPATIBILITY
-    wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
-            int x = -1, int y = -1, int width = -1, int height = -1,
-            int n = 0, char **choices = NULL,
-            int majorDim = 0, long style = wxRA_HORIZONTAL, const char *name = wxRadioBoxNameStr);
-#endif // WXWIN_COMPATIBILITY
-
+// Constructors & destructor
+       wxRadioBox();
+       inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
+             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+             int n = 0, const wxString choices[] = NULL,
+             int majorDim = 0, long style = wxRA_HORIZONTAL,
+             const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
+               {
+                       Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
+               }
+       ~wxRadioBox();
+       bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
+             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+             int n = 0, const wxString choices[] = NULL,
+             int majorDim = 0, long style = wxRA_HORIZONTAL,
+             const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
+
+// Specific functions (in wxWindows2 reference)
+       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);
+       void SetFocus();
+
+// Other variable access functions
+       inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
+       inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
+
+       void OnRadioButton( wxCommandEvent& event ) ;
 protected:
-    void SubclassRadioButton(WXHWND hWndBtn);
-
-    WXHWND *          m_radioButtons;
-    int               m_majorDim;
-    int *             m_radioWidth;  // for bitmaps
-    int *             m_radioHeight;
-
-    int               m_noItems;
-    int               m_noRowsOrCols;
-    int               m_selectedButton;
-
-    virtual void DoSetSize(int x, int y,
+       wxRadioButton           *m_radioButtonCycle;
+       
+       int               m_majorDim ;
+       int               m_noItems;
+       int               m_noRowsOrCols;
+
+// Internal functions 
+    virtual wxSize DoGetBestSize() const ;
+       virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
+
+    DECLARE_EVENT_TABLE()
 };
 
 #endif