Applying patch #10784: eliminate gauge flicker

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

diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp
index 38da4fb592b02d1b877b4970fae732f68d5bb042..3fccad27643efa2376a18f8eea8adccaefbc1a3f 100644 (file)
--- a/src/univ/stattext.cpp
+++ b/src/univ/stattext.cpp
@@ -39,7 +39,7 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_ABSTRACT_CLASS(wxStaticText, wxControl)
+IMPLEMENT_ABSTRACT_CLASS(wxStaticText, wxGenericStaticText)

 
 // ----------------------------------------------------------------------------
 // creation
 
 // ----------------------------------------------------------------------------
 // creation


@@ -57,38 +57,42 @@ bool wxStaticText::Create(wxWindow *parent,
         return false;
 
     SetLabel(label);
         return false;
 
     SetLabel(label);

-    SetBestSize(size);
+    SetInitialSize(size);

 
     return true;
 }
 
 // ----------------------------------------------------------------------------
 
     return true;
 }
 
 // ----------------------------------------------------------------------------

-// 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::DoSetLabel(const wxString& str)
+{
+    UnivDoSetLabel(str);
+}

 
 

-void wxStaticText::DoDraw(wxControlRenderer *renderer)
+wxString wxStaticText::DoGetLabel() const

 {
 {

-    renderer->DrawLabel();
+    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