Allow app to call SetWindowVariant before creation of control

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

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index d4bb7555f8f808cf9a717265ba2be3935f879819..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
@@ -115,8 +116,10 @@ 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);
 
     m_radioButtons.reserve(n);
     m_radioButtonLabels.reserve(n);
@@ -155,6 +158,16 @@ 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()
 {