X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d57be459406c2830f6abc9d99ae99166c6d133b..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/motif/stattext.cpp diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp index 947d81c39d..3b7b342e6b 100644 --- a/src/motif/stattext.cpp +++ b/src/motif/stattext.cpp @@ -6,25 +6,33 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "stattext.h" #endif +#ifdef __VMS +#define XtDisplay XTDISPLAY +#endif + #include "wx/app.h" #include "wx/stattext.h" #include +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include #include #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) -#endif bool wxStaticText::Create(wxWindow *parent, wxWindowID id, const wxString& label, @@ -40,21 +48,34 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id, 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,25 +88,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(); }