Return wxFONTFAMILY_DEFAULT, not UNKNOWN, from wxFont::GetFamily().

[wxWidgets.git] / src / motif / stattext.cpp

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 38b95a5538bf1f9c8a643308bc7f90a6a3974775..5ddee743906ae752bb88abe5ce82c1bcdb24abea 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #if wxUSE_STATTEXT
 
 #include "wx/stattext.h"
@@ -42,19 +38,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( GetLabelText( label ) );
 
     m_labelWidget =
-        XtVaCreateManagedWidget (wxConstCast(name.mb_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)),
@@ -63,17 +59,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(GetLabelText(label));
+    m_labelOrig = label;       // save original label
+
+    // Motif does not support neither ellipsize nor markup in static text:
+    DoSetLabel(GetEllipsizedLabelWithoutMarkup());
+}
+
+// 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;
@@ -84,4 +104,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