wxMac should use /src/mac/carbon/spinctrl.cpp, applied some sizing

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

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index 591f88e21c4d398c393969b3d2d52a83e0fbffce..d1e91a0bfc727c0ea7f09434efaba6713bb4ab4d 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -12,50 +12,78 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "radiobox.h"
 #endif
 
-#include "wx/control.h"
+#ifndef wxWIDGET_ARRAY_DEFINED
+    #define wxWIDGET_ARRAY_DEFINED
 
-WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
+    #include "wx/dynarray.h"
+    WX_DEFINE_ARRAY(WXWidget, wxWidgetArray);
+#endif
 
-// List box item
-class WXDLLEXPORT wxBitmap ;
+#include "wx/arrstr.h"
 
-class WXDLLEXPORT wxRadioBox : public wxControl
+class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
 {
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 
 public:
-    wxRadioBox();
+    wxRadioBox() { Init(); }
 
     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)
+               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);
+        Init();
+
+        Create(parent, id, title, pos, size, n, choices,
+               majorDim, style, val, name);
+    }
+
+    wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
+               int majorDim = 0, long style = wxRA_HORIZONTAL,
+               const wxValidator& val = wxDefaultValidator,
+               const wxString& name = wxRadioBoxNameStr)
+    {
+        Init();
+
+        Create(parent, id, title, pos, size, 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);
+                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);
+
+    bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                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 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 +94,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; }
 
@@ -73,23 +104,22 @@ public:
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
-    WXWidget GetTopWidget() const { return m_formWidget; }
-    WXWidget GetLabelWidget() const { return m_labelWidget; }
-    WXWidget GetFrameWidget() const { return m_frameWidget; }
-    inline WXWidget* GetRadioButtons() const { return m_radioButtons; }
-    inline void SetSel(int i) { m_selectedButton = i; }
+    const wxWidgetArray& GetRadioButtons() const { return m_radioButtons; }
+    void SetSel(int i) { m_selectedButton = i; }
+    virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
+
+private:
+    void Init();
 
 protected:
-    int               m_majorDim ;
+    int               m_majorDim;
     int               m_noItems;
     int               m_noRowsOrCols;
     int               m_selectedButton;
 
-    WXWidget          m_formWidget;
+    wxWidgetArray     m_radioButtons;
     WXWidget          m_labelWidget;
-    WXWidget          m_frameWidget;
-    WXWidget*         m_radioButtons;
-    wxString*         m_radioButtonLabels;
+    wxArrayString     m_radioButtonLabels;
 
     virtual void DoSetSize(int x, int y,
         int width, int height,