Don't show focus rectangle if wxNO_BORDER specified

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index b0cd4e5c74912d513c40336b35f8698c1f3a1e0d..2e0b1362052caa1cf275af48dbacdc71bfe7a72b 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -13,6 +13,9 @@
 #pragma implementation "stattext.h"
 #endif
 
 #pragma implementation "stattext.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif


@@ -47,7 +50,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
     Widget borderWidget =
         (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
 
     Widget borderWidget =
         (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );

-    wxXmString text( label );
+    wxXmString text( wxStripMenuCodes( label ) );

     WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));
 
     m_labelWidget = XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),
     WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));
 
     m_labelWidget = XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),