implemented Freeze/Thaw() (patch 922156)

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

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 365fe2b3360af51fdf576b29b8f9137c91eb007e..774c4df47c5fa79edfeefeb0a8296ba59936aeb7 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -21,6 +21,7 @@
 
 #include "wx/radiobox.h"
 #include "wx/utils.h"
+#include "wx/arrstr.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -43,15 +44,12 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData,
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 
 // Radio box item
-wxRadioBox::wxRadioBox()
+void wxRadioBox::Init()
 {
     m_selectedButton = -1;
     m_noItems = 0;
     m_noRowsOrCols = 0;
     m_majorDim = 0 ;
-
-    m_radioButtons = (WXWidget*) NULL;
-    m_radioButtonLabels = (wxString*) NULL;
 }
 
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
@@ -60,26 +58,10 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
              int majorDim, long style,
              const wxValidator& val, const wxString& name)
 {
-    m_selectedButton = -1;
-    m_noItems = n;
-    m_radioButtons = (WXWidget*) NULL;
-    m_radioButtonLabels = (wxString*) NULL;
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-    m_font = parent->GetFont();
-
-    SetName(name);
-    SetValidator(val);
-
-    parent->AddChild(this);
-
-    m_windowStyle = (long&)style;
-
-    if (id == -1)
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
+    if( !CreateControl( parent, id, pos, size, style, val, name ) )
+        return false;
 
+    m_noItems = n;
     m_noRowsOrCols = majorDim;
 
     if (majorDim==0)
@@ -134,20 +116,20 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
     XtSetArg (args[0], XmNorientation, ((style & wxHORIZONTAL) == wxHORIZONTAL ?
                                           XmHORIZONTAL : XmVERTICAL));
     XtSetArg (args[1], XmNnumColumns, m_majorDim);
+    XtSetArg (args[2], XmNadjustLast, False);
 
-    Widget radioBoxWidget = XmCreateRadioBox ((Widget)m_mainWidget, "radioBoxWidget", args, 2);
+    Widget radioBoxWidget =
+        XmCreateRadioBox ((Widget)m_mainWidget, "radioBoxWidget", args, 3);
 
-    //    if (style & wxFLAT)
-    //        XtVaSetValues (radioBoxWidget, XmNborderWidth, 1, NULL);
+    m_radioButtons.reserve(n);
+    m_radioButtonLabels.reserve(n);
 
-    m_radioButtons = new WXWidget[n];
-    m_radioButtonLabels = new wxString[n];
     int i;
     for (i = 0; i < n; i++)
     {
         wxString str(wxStripMenuCodes(choices[i]));
-        m_radioButtonLabels[i] = str;
-        m_radioButtons[i] = (WXWidget) XtVaCreateManagedWidget (wxConstCast(str.c_str(), char),
+        m_radioButtonLabels.push_back(str);
+        Widget radioItem =  XtVaCreateManagedWidget (wxConstCast(str.c_str(), char),
 #if wxUSE_GADGETS
                             xmToggleButtonGadgetClass, radioBoxWidget,
 #else
@@ -155,11 +137,12 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 #endif
                             wxFont::GetFontTag(), fontType,
                                                  NULL);
-        XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,
-                     (XtPointer) this);
+        m_radioButtons.push_back((WXWidget)radioItem);
+        XtAddCallback (radioItem, XmNvalueChangedCallback,
+                       (XtCallbackProc) wxRadioBoxCallback,
+                       (XtPointer) this);
     }
 
-    m_font = parent->GetFont();
     ChangeFont(FALSE);
 
     SetSelection (0);
@@ -175,12 +158,19 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
     return TRUE;
 }
 
+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)
+{
+    wxCArrayString chs(choices);
+    return Create(parent, id, title, pos, size, chs.GetCount(),
+                  chs.GetStrings(), majorDim, style, val, name);
+}
 
 wxRadioBox::~wxRadioBox()
 {
-    delete[] m_radioButtonLabels;
-    delete[] m_radioButtons;
-
     DetachWidget(m_mainWidget);
     XtDestroyWidget((Widget) m_mainWidget);
 
@@ -197,6 +187,7 @@ void wxRadioBox::SetString(int item, const wxString& label)
     {
         wxString label1(wxStripMenuCodes(label));
         wxXmString text( label1 );
+        m_radioButtonLabels[item] = label1;
         XtVaSetValues (widget,
                         XmNlabelString, text(),
                         XmNlabelType, XmSTRING,
@@ -431,8 +422,9 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData,
   wxRadioBox *item = (wxRadioBox *) clientData;
   int sel = -1;
   int i;
+  const wxWidgetArray& buttons = item->GetRadioButtons();
   for (i = 0; i < item->GetCount(); i++)
-    if (item->GetRadioButtons() && ((Widget) (item->GetRadioButtons()[i]) == w))
+    if (((Widget)buttons[i]) == w)
       sel = i;
   item->SetSel(sel);