X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c5fd8a319e58c0d8c58d73360ee9d4874c87bd8..aa83b6fc90e78371fcc2fb69de77ab7b90293dd1:/src/univ/stattext.cpp

diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp
index 83ebf31eaf..3fccad2764 100644
--- a/src/univ/stattext.cpp
+++ b/src/univ/stattext.cpp
@@ -39,7 +39,7 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_ABSTRACT_CLASS(wxStaticText, wxControl)
+IMPLEMENT_ABSTRACT_CLASS(wxStaticText, wxGenericStaticText)
 
 // ----------------------------------------------------------------------------
 // creation
@@ -63,40 +63,36 @@ bool wxStaticText::Create(wxWindow *parent,
 }
 
 // ----------------------------------------------------------------------------
-// size management
+// drawing
 // ----------------------------------------------------------------------------
 
-void wxStaticText::SetLabel(const wxString& label)
+void wxStaticText::DoDraw(wxControlRenderer *renderer)
 {
-    wxControl::SetLabel(label);
+    renderer->DrawLabel();
 }
 
-wxSize wxStaticText::DoGetBestClientSize() const
+void wxStaticText::SetLabel(const wxString& str)
 {
-    wxStaticText *self = wxConstCast(this, wxStaticText);
-    wxClientDC dc(self);
-    dc.SetFont(GetFont());
-    wxCoord width, height;
-    dc.GetMultiLineTextExtent(GetLabel(), &width, &height);
+    // save original label
+    m_labelOrig = str;
 
-    return wxSize(width, height);
+    // draw as real label the result of GetEllipsizedLabelWithoutMarkup:
+    DoSetLabel(GetEllipsizedLabelWithoutMarkup());
 }
 
-// ----------------------------------------------------------------------------
-// drawing
-// ----------------------------------------------------------------------------
-
-void wxStaticText::DoDraw(wxControlRenderer *renderer)
+void wxStaticText::DoSetLabel(const wxString& str)
 {
-    if ( UseBgCol() )
-    {
-        wxDC& dc = renderer->GetDC();
-        dc.SetBrush(GetBackgroundColour());
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        dc.DrawRectangle(renderer->GetRect());
-    }
+    UnivDoSetLabel(str);
+}
 
-    renderer->DrawLabel();
+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