/////////////////////////////////////////////////////////////////////////////
-// Name: stattext.cpp
+// Name: src/motif/stattext.cpp
// Purpose: wxStaticText
// Author: Julian Smart
// Modified by:
#define XtDisplay XTDISPLAY
#endif
-#include "wx/defs.h"
-
#if wxUSE_STATTEXT
#include "wx/stattext.h"
#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,
Widget borderWidget =
(Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
- wxXmString text( wxStripMenuCodes( label ) );
+ wxXmString text( GetLabelText( label ) );
m_labelWidget =
XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),
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;
void wxStaticText::SetLabel(const wxString& label)
{
- wxXmString label_str(wxStripMenuCodes(label));
+ wxXmString label_str(GetLabelText(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