X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96be256b3e1802de10f45953c41ed33bce399b54..926ce9e3ac32e1a33cc43420f76876fac8868436:/src/motif/stattext.cpp?ds=inline diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp index 3f31485685..79d3ea330d 100644 --- a/src/motif/stattext.cpp +++ b/src/motif/stattext.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "stattext.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -21,6 +17,9 @@ #endif #include "wx/defs.h" + +#if wxUSE_STATTEXT + #include "wx/stattext.h" #ifdef __VMS__ @@ -33,7 +32,7 @@ #include "wx/motif/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl); +IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) bool wxStaticText::Create(wxWindow *parent, wxWindowID id, const wxString& label, @@ -51,18 +50,18 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id, Widget borderWidget = (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style ); wxXmString text( wxStripMenuCodes( label ) ); - WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget)); - - m_labelWidget = XtVaCreateManagedWidget (wxConstCast(name.c_str(), char), - xmLabelWidgetClass, - borderWidget ? borderWidget : parentWidget, - wxFont::GetFontTag(), fontType, - XmNlabelString, text(), - XmNalignment, - ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END : - ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER : - XmALIGNMENT_BEGINNING)), - NULL); + + 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); m_mainWidget = borderWidget ? borderWidget : m_labelWidget; @@ -81,27 +80,10 @@ void wxStaticText::SetLabel(const wxString& label) // This variable means we don't need so many casts later. Widget widget = (Widget) m_labelWidget; - if (GetWindowStyle() & wxST_NO_AUTORESIZE) - { - XtUnmanageChild(widget); - Dimension width, height; - XtVaGetValues(widget, XmNwidth, &width, XmNheight, &height, NULL); - XtVaSetValues(widget, XmNlabelString, label_str(), XmNlabelType, XmSTRING, NULL); - XtVaSetValues(widget, - XmNwidth, width, - XmNheight, height, - NULL); - XtManageChild(widget); - } - else - { - XtVaSetValues(widget, - XmNlabelString, label_str(), - XmNlabelType, XmSTRING, - NULL); - } } + +#endif // wxUSE_STATTEXT