X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f516d986371b7643efda569d64ae19e75d221411..eab9751b66c3c9087e1d76f78df006a456d7410f:/src/motif/radiobut.cpp diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp index 70847aee23..00ec024178 100644 --- a/src/motif/radiobut.cpp +++ b/src/motif/radiobut.cpp @@ -16,10 +16,11 @@ #define XtDisplay XTDISPLAY #endif -#include "wx/defs.h" - #include "wx/radiobut.h" -#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" +#endif #ifdef __VMS__ #pragma message disable nosimpint @@ -54,7 +55,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, Widget parentWidget = (Widget) parent->GetClientWidget(); Display* dpy = XtDisplay(parentWidget); - wxString label1(wxStripMenuCodes(label)); + wxString label1(GetLabelText(label)); wxXmString text( label1 ); @@ -141,7 +142,7 @@ void wxRadioButton::ChangeBackgroundColour() // What colour should this be? wxColour colour = *wxBLACK; - int selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget)); + WXPixel selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget)); XtVaSetValues ((Widget) GetMainWidget(), XmNselectColor, selectPixel,