Add test that wxABI_VERSION is not set when compiling the library

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 2e0b1362052caa1cf275af48dbacdc71bfe7a72b..532576d897d17e4ed82f5450820c2bc849a4dc43 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -51,18 +51,17 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     Widget borderWidget =
         (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
     wxXmString text( wxStripMenuCodes( 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);
+
+    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;
 
@@ -71,7 +70,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
     ChangeBackgroundColour ();
 
-    return TRUE;
+    return true;
 }
 
 void wxStaticText::SetLabel(const wxString& label)