Motif updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/motif/button.cpp

@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/button.h"
+#include "wx/utils.h"
 
 #include <Xm/PushBG.h>
 #include <Xm/PushB.h>
@@ -45,9 +46,9 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     else
         m_windowId = id;
 
-    char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
+    wxString label1(wxStripMenuCodes(label));
 
-    XmString text = XmStringCreateSimple (label1);
+    XmString text = XmStringCreateSimple ((char*) (const char*) label1);
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     /*