X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/338dd992160bf20205743c092b353d96ef7604fb..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/motif/checkbox.cpp diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp index d528c697f9..613052ef21 100644 --- a/src/motif/checkbox.cpp +++ b/src/motif/checkbox.cpp @@ -13,6 +13,12 @@ #pragma implementation "checkbox.h" #endif +#ifdef __VMS +#define XtDisplay XTDISPLAY +#endif + +#include "wx/defs.h" + #include "wx/checkbox.h" #include "wx/utils.h" @@ -32,10 +38,8 @@ void wxCheckBoxCallback (Widget w, XtPointer clientData, XtPointer ptr); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) -#endif // Single check box item bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, @@ -62,8 +66,9 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, char* label1 = (label.IsNull() ? "" : (char*) (const char*) label); XmString text = XmStringCreateSimple (label1); #endif + wxString label1(wxStripMenuCodes(label)); - wxXmString text( label ); + wxXmString text( label1 ); Widget parentWidget = (Widget) parent->GetClientWidget(); XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));