X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..b35c7335f1d0cdad38fce37c72348c4be6c73f52:/src/motif/control.cpp diff --git a/src/motif/control.cpp b/src/motif/control.cpp index 818f8bc176..4026913541 100644 --- a/src/motif/control.cpp +++ b/src/motif/control.cpp @@ -1,26 +1,23 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.cpp +// Name: src/motif/control.cpp // Purpose: wxControl class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// 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(),