// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
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_windowFont = parent->GetFont();
+ 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);
-
- XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
+#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,