Fixed usage of wxXmString

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 0a5e6377f102b7020af67e940a1f91be1c45a1bc..1dc7e344c54a1c0ae1ceab45959b157b2a50708a 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -27,6 +27,8 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

+#include "wx/motif/private.h"
+

 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)


@@ -68,11 +70,11 @@ void wxControl::SetLabel(const wxString& label)
     if (!widget)
         return;
 
     if (!widget)
         return;
 

-    wxString buf(wxStripMenuCodes());
+    wxString buf(wxStripMenuCodes(label));

     wxXmString label_str(buf);
 
     XtVaSetValues (widget,
     wxXmString label_str(buf);
 
     XtVaSetValues (widget,

-        XmNlabelString, label_str,
+        XmNlabelString, label_str(),

         XmNlabelType, XmSTRING,
         NULL);
 }
         XmNlabelType, XmSTRING,
         NULL);
 }