Hardware defines spec.

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

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index d4bb7555f8f808cf9a717265ba2be3935f879819..c21d758ecdca558765b59f038e5a4958e83199f3 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -13,6 +13,9 @@
 #pragma implementation "radiobox.h"
 #endif
 
 #pragma implementation "radiobox.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif


@@ -21,6 +24,7 @@
 
 #include "wx/radiobox.h"
 #include "wx/utils.h"
 
 #include "wx/radiobox.h"
 #include "wx/utils.h"

+#include "wx/arrstr.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -115,8 +119,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[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);
 
     m_radioButtons.reserve(n);
     m_radioButtonLabels.reserve(n);


@@ -155,6 +161,16 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
     return TRUE;
 }
 
     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()
 {
 
 wxRadioBox::~wxRadioBox()
 {