X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fe5be6e01e97288ddb23834d10673431bb4a575..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/motif/stattext.cpp diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp index 79d3ea330d..917c3bf34a 100644 --- a/src/motif/stattext.cpp +++ b/src/motif/stattext.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: stattext.cpp +// Name: src/motif/stattext.cpp // Purpose: wxStaticText // Author: Julian Smart // Modified by: @@ -12,12 +12,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __VMS -#define XtDisplay XTDISPLAY -#endif - -#include "wx/defs.h" - #if wxUSE_STATTEXT #include "wx/stattext.h" @@ -32,8 +26,6 @@ #include "wx/motif/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) - bool wxStaticText::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, @@ -44,19 +36,19 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id, if( !CreateControl( parent, id, pos, size, style, wxDefaultValidator, name ) ) return false; + m_labelWidget = (WXWidget) 0; + PreCreation(); Widget parentWidget = (Widget) parent->GetClientWidget(); Widget borderWidget = (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style ); - wxXmString text( wxStripMenuCodes( label ) ); m_labelWidget = - XtVaCreateManagedWidget (wxConstCast(name.c_str(), char), + XtVaCreateManagedWidget (name.mb_str(), 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)), @@ -65,17 +57,41 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id, m_mainWidget = borderWidget ? borderWidget : m_labelWidget; - AttachWidget (parent, m_mainWidget, (WXWidget) NULL, - pos.x, pos.y, size.x, size.y); + SetLabel(label); - ChangeBackgroundColour (); + wxSize best = GetBestSize(); + if( size.x != -1 ) best.x = size.x; + if( size.y != -1 ) best.y = size.y; + + PostCreation(); + AttachWidget (parent, m_mainWidget, (WXWidget) NULL, + pos.x, pos.y, best.x, best.y); return true; } void wxStaticText::SetLabel(const wxString& label) { - wxXmString label_str(wxStripMenuCodes(label)); + m_labelOrig = label; // save original label + + // Motif does not support ellipsized labels natively + DoSetLabel(GetEllipsizedLabel()); +} + +// for wxST_ELLIPSIZE_* support: + +wxString wxStaticText::DoGetLabel() const +{ + XmString label = NULL; + XtVaGetValues((Widget)m_labelWidget, XmNlabelString, &label, NULL); + + return wxXmStringToString(label); +} + +void wxStaticText::DoSetLabel(const wxString& str) +{ + // build our own cleaned label + wxXmString label_str(RemoveMnemonics(str)); // This variable means we don't need so many casts later. Widget widget = (Widget) m_labelWidget; @@ -86,4 +102,17 @@ void wxStaticText::SetLabel(const wxString& label) NULL); } +/* + FIXME: UpdateLabel() should be called on size events to allow correct + dynamic ellipsizing of the label +*/ + +wxSize wxStaticText::DoGetBestSize() const +{ + int w, h; + GetTextExtent(GetLabelText(), &w, &h, NULL, NULL, NULL); + + return wxSize(w, h); +} + #endif // wxUSE_STATTEXT