Clean-up, speed-up and bug-fix for wxListCtrl drawing,

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

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index d528c697f9f4dc5ab6e8de99a96498627e590d24..32b1413b6a204826d7fffc1f5412d45b5c5b8aee 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -32,10 +32,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 +60,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));