X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a595736d07382f41ab09bacdd692fe9a4cad894..9bb50fd0b04c824fc7ba14c0dc4ba4a2a9a1e6ad:/src/motif/stattext.cpp

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index bbfd843ca0..b0e9dcf79f 100644
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -9,15 +9,21 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "stattext.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_STATTEXT
+
 #include "wx/stattext.h"
 
 #ifdef __VMS__
@@ -47,19 +53,18 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
     Widget borderWidget =
         (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
-    wxXmString text( label );
-    WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));
-
-    m_labelWidget = XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),
-                                         xmLabelWidgetClass,
-                                         borderWidget ? borderWidget : parentWidget,
-                                         wxFont::GetFontTag(), fontType,
-                                         XmNlabelString, text(),
-                                         XmNalignment,
-                     ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END :
-                     ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER :
-                     XmALIGNMENT_BEGINNING)),
-                                         NULL);
+    wxXmString text( wxStripMenuCodes( label ) );
+
+    m_labelWidget =
+        XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),
+            xmLabelWidgetClass,
+            borderWidget ? borderWidget : parentWidget,
+            wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay(parentWidget)),
+            XmNlabelString, text(),
+            XmNalignment, ((style & wxALIGN_RIGHT)  ? XmALIGNMENT_END :
+                          ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER :
+                                                      XmALIGNMENT_BEGINNING)),
+            NULL);
 
     m_mainWidget = borderWidget ? borderWidget : m_labelWidget;
 
@@ -68,7 +73,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
     ChangeBackgroundColour ();
 
-    return TRUE;
+    return true;
 }
 
 void wxStaticText::SetLabel(const wxString& label)
@@ -91,7 +96,7 @@ void wxStaticText::SetLabel(const wxString& label)
         XtVaSetValues(widget,
             XmNwidth, width,
             XmNheight, height,
-            NULL);        
+            NULL);
         XtManageChild(widget);
     }
     else
@@ -102,3 +107,5 @@ void wxStaticText::SetLabel(const wxString& label)
             NULL);
     }
 }
+
+#endif // wxUSE_STATTEXT