X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..507abc7b3af8d73e7caf05261d1f40b51775ae7a:/src/motif/control.cpp diff --git a/src/motif/control.cpp b/src/motif/control.cpp index 2f503b86ae..4026913541 100644 --- a/src/motif/control.cpp +++ b/src/motif/control.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.cpp +// Name: src/motif/control.cpp // Purpose: wxControl class // Author: Julian Smart // Modified by: @@ -9,18 +9,15 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "control.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #include "wx/control.h" -#include "wx/panel.h" -#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/panel.h" +#endif #ifdef __VMS__ #pragma message disable nosimpint @@ -88,7 +85,7 @@ void wxControl::SetLabel(const wxString& label) if (!widget) return; - wxXmString label_str(wxStripMenuCodes(label)); + wxXmString label_str(GetLabelText(label)); XtVaSetValues (widget, XmNlabelString, label_str(),