add wxMBConvStrictUTF8 class implementing just UTF-8 conversion, without support...

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

diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp
index 509a5d6dde3b09c1313ab15180170507ab786aba..f854398a17b68da74a6eaa4edbbd06b50382b9e7 100644 (file)
--- a/src/univ/stattext.cpp
+++ b/src/univ/stattext.cpp
@@ -66,11 +66,6 @@ bool wxStaticText::Create(wxWindow *parent,
 // size management
 // ----------------------------------------------------------------------------
 
 // size management
 // ----------------------------------------------------------------------------
 

-void wxStaticText::SetLabel(const wxString& label)
-{
-    wxControl::SetLabel(label);
-}
-

 wxSize wxStaticText::DoGetBestClientSize() const
 {
     wxStaticText *self = wxConstCast(this, wxStaticText);
 wxSize wxStaticText::DoGetBestClientSize() const
 {
     wxStaticText *self = wxConstCast(this, wxStaticText);


@@ -91,4 +86,28 @@ void wxStaticText::DoDraw(wxControlRenderer *renderer)
     renderer->DrawLabel();
 }
 
     renderer->DrawLabel();
 }
 

+void wxStaticText::SetLabel(const wxString& str)
+{
+    // save original label
+    m_labelOrig = str;
+
+    // draw as real label the result of GetEllipsizedLabelWithoutMarkup:
+    DoSetLabel(GetEllipsizedLabelWithoutMarkup());
+}
+
+void wxStaticText::DoSetLabel(const wxString& str)
+{
+    UnivDoSetLabel(str);
+}
+
+wxString wxStaticText::DoGetLabel() const
+{
+    return wxControl::GetLabel();
+}
+
+/*
+   FIXME: UpdateLabel() should be called on size events to allow correct
+          dynamic ellipsizing of the label
+*/
+

 #endif // wxUSE_STATTEXT
 #endif // wxUSE_STATTEXT