X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3399051ee9fa4dfa5fa7ac2dd9034062f4414d64..571d14b2621325840e465e1e55be9f5a362a5dbd:/include/wx/motif/radiobox.h

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index 7f27104b40..d1e91a0bfc 100644
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -12,40 +12,71 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#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, 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)
+    {
+        Init();
+
+        Create(parent, id, title, pos, size, n, choices,
+               majorDim, style, val, name);
+    }
 
     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,
+               const wxSize& size,
+               const wxArrayString& choices,
+               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, 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);
@@ -73,19 +104,22 @@ public:
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
-    WXWidget* GetRadioButtons() const { return m_radioButtons; }
+    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_noItems;
     int               m_noRowsOrCols;
     int               m_selectedButton;
 
-    WXWidget*         m_radioButtons;
+    wxWidgetArray     m_radioButtons;
     WXWidget          m_labelWidget;
-    wxString*         m_radioButtonLabels;
+    wxArrayString     m_radioButtonLabels;
 
     virtual void DoSetSize(int x, int y,
         int width, int height,