Minor header cleaning.

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

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 09b06715d1f81937d6003d77006dfdc1ca395db1..fa7aba0fa4a77eea18a14c5ca975e7a522093689 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -22,10 +22,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
+    #include "wx/arrstr.h"
 #endif
 
-#include "wx/arrstr.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
@@ -77,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())
     {
@@ -121,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),
@@ -180,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,
@@ -352,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++)
     {