X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaa6d89a0d0810b001a9217df913b9b74b883c8d..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/motif/radiobox.cpp diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp index 35faf81059..fa7aba0fa4 100644 --- a/src/motif/radiobox.cpp +++ b/src/motif/radiobox.cpp @@ -76,7 +76,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, XmNresizeWidth, True, NULL); - wxString label1(wxStripMenuCodes(title)); + wxString label1(GetLabelText(title)); if (!label1.empty()) { @@ -120,7 +120,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, int i; for (i = 0; i < n; i++) { - wxString str(wxStripMenuCodes(choices[i])); + wxString str(GetLabelText(choices[i])); m_radioButtonLabels.push_back(str); Widget radioItem = XtVaCreateManagedWidget ( wxConstCast(str.c_str(), char), @@ -179,7 +179,7 @@ void wxRadioBox::SetString(unsigned int item, const wxString& label) Widget widget = (Widget)m_radioButtons[item]; if (!label.empty()) { - wxString label1(wxStripMenuCodes(label)); + wxString label1(GetLabelText(label)); wxXmString text( label1 ); m_radioButtonLabels[item] = label1; XtVaSetValues (widget, @@ -351,7 +351,7 @@ void wxRadioBox::ChangeBackgroundColour() wxWindow::ChangeBackgroundColour(); wxColour colour = *wxBLACK; - int selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget)); + WXPixel selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget)); for (unsigned int i = 0; i < m_noItems; i++) {