Changed two conflicting defines in defs.h

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 57da5bfdeba339266a44752979a6bf0f40a38da9..a5105b10ece5329865a7829fdc37271fc2fba84e 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -36,25 +36,38 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     SetName(name);
     if (parent) parent->AddChild(this);
 
-    SetBackgroundColour(parent->GetBackgroundColour()) ;
-    SetForegroundColour(parent->GetForegroundColour()) ;
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
 
     if ( id == -1 )
-           m_windowId = (int)NewControlId();
+              m_windowId = (int)NewControlId();
     else
-           m_windowId = id;
+            m_windowId = id;
 
     m_windowStyle = style;
+    m_font = parent->GetFont();
 
+#if 0  // gcc 2.95 doesn't like this apparently    
     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
-
+#endif
+    
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
-    XmString text = XmStringCreateSimple (label1);
+#if 0 // gcc 2.95 doesn't like this apparently    
+    // Use XmStringCreateLtoR(), since XmStringCreateSimple
+    // doesn't obey separators.
+//    XmString text = XmStringCreateSimple (label1);
+    XmString text = XmStringCreateLtoR (label1, XmSTRING_DEFAULT_CHARSET);
+#endif // 0
+    
+    XmString text = XmStringCreateLtoR ((char *)(const char*)label, XmSTRING_DEFAULT_CHARSET);
+    
+    XmFontList fontList = (XmFontList) m_font.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,10 +80,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());
-
-    ChangeColour (m_mainWidget);
+    ChangeBackgroundColour ();
 
     return TRUE;
 }
 
+void wxStaticText::ChangeFont(bool keepOriginalSize)
+{
+    wxWindow::ChangeFont(keepOriginalSize);
+}
+
+void wxStaticText::ChangeBackgroundColour()
+{
+    wxWindow::ChangeBackgroundColour();
+}
+
+void wxStaticText::ChangeForegroundColour()
+{
+    wxWindow::ChangeForegroundColour();
+}
+