concentrating content and structure region calculations

[wxWidgets.git] / src / univ / radiobox.cpp

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index 47b7c1a3991ff34bc45b97a79c5199ceffb3d3c0..621fde6d6fe02baef937b13ebb40f846fb5d858c 100644 (file)
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -34,6 +34,7 @@
     #include "wx/radiobox.h"
     #include "wx/radiobut.h"
     #include "wx/validate.h"
+    #include "wx/arrstr.h"
 #endif
 
 #include "wx/tooltip.h"
@@ -95,32 +96,41 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 // wxRadioBox creation
 // ----------------------------------------------------------------------------
 
-wxRadioBox::wxRadioBox()
+void wxRadioBox::Init()
 {
-    Init();
+    m_selection = -1;
+    m_majorDim = 0;
 }
 
-wxRadioBox::wxRadioBox(wxWindow *parent,
-                       wxWindowID id,
-                       const wxString& title,
-                       const wxPoint& pos,
-                       const wxSize& size,
-                       int n,
-                       const wxString *choices,
-                       int majorDim,
-                       long style,
-                       const wxValidator& val,
-                       const wxString& name)
+wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
+                       const wxPoint& pos, const wxSize& size,
+                       const wxArrayString& choices,
+                       int majorDim, long style,
+                       const wxValidator& val, const wxString& name)
 {
+    wxCArrayString chs(choices);
+
     Init();
 
-    (void)Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
+    (void)Create(parent, id, title, pos, size, chs.GetCount(), 
+                 chs.GetStrings(), majorDim, style, val, name);
 }
 
-void wxRadioBox::Init()
+bool wxRadioBox::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxString& title,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        const wxArrayString& choices,
+                        int majorDim,
+                        long style,
+                        const wxValidator& val,
+                        const wxString& name)
 {
-    m_selection = -1;
-    m_majorDim = 0;
+    wxCArrayString chs(choices);
+
+    return Create(parent, id, title, pos, size, chs.GetCount(), 
+                  chs.GetStrings(), majorDim, style, val, name);
 }
 
 bool wxRadioBox::Create(wxWindow *parent,