added wsock32.lib (patch 880683)

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index bbfd843ca06441afe23cf84f6230e9da406886fe..db5721cc84cb7cda1cfe0679ab5eca2534fbf77a 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "stattext.h"
 #endif
 
 #pragma implementation "stattext.h"
 #endif
 


@@ -47,7 +47,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),