X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4294b7832a5aed3c1cccc06aecd227d43da8830..926ce9e3ac32e1a33cc43420f76876fac8868436:/src/motif/stattext.cpp?ds=inline diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp index 57da5bfdeb..79d3ea330d 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" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __VMS +#define XtDisplay XTDISPLAY #endif -#include "wx/app.h" -#include "wx/stattext.h" +#include "wx/defs.h" -#include +#if wxUSE_STATTEXT + +#include "wx/stattext.h" +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include -#include -#include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif + +#include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) -#endif bool wxStaticText::Create(wxWindow *parent, wxWindowID id, const wxString& label, @@ -33,44 +41,49 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { - SetName(name); - if (parent) parent->AddChild(this); - - SetBackgroundColour(parent->GetBackgroundColour()) ; - SetForegroundColour(parent->GetForegroundColour()) ; + if( !CreateControl( parent, id, pos, size, style, + wxDefaultValidator, name ) ) + return false; - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; + Widget parentWidget = (Widget) parent->GetClientWidget(); - m_windowStyle = style; + Widget borderWidget = + (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style ); + wxXmString text( wxStripMenuCodes( label ) ); - char* label1 = (label.IsNull() ? "" : (char*) (const char*) label); + 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)), + XmNrecomputeSize, ((style & wxST_NO_AUTORESIZE) ? TRUE : FALSE), + NULL); - Widget parentWidget = (Widget) parent->GetClientWidget(); + m_mainWidget = borderWidget ? borderWidget : m_labelWidget; - XmString text = XmStringCreateSimple (label1); + AttachWidget (parent, m_mainWidget, (WXWidget) NULL, + pos.x, pos.y, size.x, size.y); - m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name, - xmLabelWidgetClass, - parentWidget, - XmNlabelString, text, - XmNalignment, - ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END : - ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER : - XmALIGNMENT_BEGINNING)), - NULL); + ChangeBackgroundColour (); - XmStringFree (text); - - SetCanAddEventHandler(TRUE); - AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y); + return true; +} - SetFont(* parent->GetFont()); +void wxStaticText::SetLabel(const wxString& label) +{ + wxXmString label_str(wxStripMenuCodes(label)); - ChangeColour (m_mainWidget); + // This variable means we don't need so many casts later. + Widget widget = (Widget) m_labelWidget; - return TRUE; + XtVaSetValues(widget, + XmNlabelString, label_str(), + XmNlabelType, XmSTRING, + NULL); } +#endif // wxUSE_STATTEXT