X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d57be459406c2830f6abc9d99ae99166c6d133b..57c0af52bffc66b12b7e7b49b3a2dfdcf2d2e352:/src/motif/stattext.cpp?ds=sidebyside

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 947d81c39d..996cf9315e 100644
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -45,16 +45,23 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 	    m_windowId = id;
 
     m_windowStyle = style;
+    m_windowFont = parent->GetFont();
 
     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
-    XmString text = XmStringCreateSimple (label1);
+    // Use XmStringCreateLtoR(), since XmStringCreateSimple
+    // doesn't obey separators.
+//    XmString text = XmStringCreateSimple (label1);
+    XmString text = XmStringCreateLtoR (label1, XmSTRING_DEFAULT_CHARSET);
+
+    XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,
                                          xmLabelWidgetClass,
                                          parentWidget,
+                                         XmNfontList, fontList,
                                          XmNlabelString, text,
                                          XmNalignment,
                      ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END :
@@ -67,25 +74,23 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
-    SetFont(* parent->GetFont());
-
     ChangeBackgroundColour ();
 
     return TRUE;
 }
 
-void wxStaticText::ChangeFont()
+void wxStaticText::ChangeFont(bool keepOriginalSize)
 {
-    // TODO
+    wxWindow::ChangeFont(keepOriginalSize);
 }
 
 void wxStaticText::ChangeBackgroundColour()
 {
-    // TODO
+    wxWindow::ChangeBackgroundColour();
 }
 
 void wxStaticText::ChangeForegroundColour()
 {
-    // TODO
+    wxWindow::ChangeForegroundColour();
 }