From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 28 Jul 1999 22:27:44 +0000 (+0000)
Subject: string and m_majorDim == 0 bugs fixed
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9830033051ecd1f265326be9d48240dfebe9fcb3

string and m_majorDim == 0 bugs fixed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 05e006095b..83cb28543e 100644
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -88,8 +88,6 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 
     wxString label1(wxStripMenuCodes(title));
 
-    wxXmString text(label1.c_str());
-
     Widget formWidget = XtVaCreateManagedWidget (name.c_str(),
                                         xmFormWidgetClass, parentWidget,
                                         XmNmarginHeight, 0,
@@ -111,7 +109,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
                                              xmLabelWidgetClass, formWidget,
 #endif
                                              XmNfontList, fontList,
-                                             XmNlabelString, text,
+                                             XmNlabelString, text(),
                                              NULL);
     }
 
@@ -126,11 +124,11 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 
     Arg args[3];
 
-    majorDim = (n + majorDim - 1) / majorDim;
+    majorDim = (n + m_majorDim - 1) / majorDim;
 
     XtSetArg (args[0], XmNorientation, ((style & wxHORIZONTAL) == wxHORIZONTAL ?
                                           XmHORIZONTAL : XmVERTICAL));
-    XtSetArg (args[1], XmNnumColumns, majorDim);
+    XtSetArg (args[1], XmNnumColumns, m_majorDim);
 
     Widget radioBoxWidget = XmCreateRadioBox (frameWidget, "radioBoxWidget", args, 2);
     m_mainWidget = (WXWidget) radioBoxWidget;