get rid of MSVC warning about possibly uninitialized variable in CalcAndSendEvent...

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

diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp
index 6f1261c91761e5be698feb074aae3cd8bf8319ff..f854398a17b68da74a6eaa4edbbd06b50382b9e7 100644 (file)
--- a/src/univ/stattext.cpp
+++ b/src/univ/stattext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        univ/stattext.cpp
+// Name:        src/univ/stattext.cpp

 // Purpose:     wxStaticText
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxStaticText
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -25,9 +25,10 @@
 
 #if wxUSE_STATTEXT
 
 
 #if wxUSE_STATTEXT
 

+#include "wx/stattext.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"

-    #include "wx/stattext.h"

     #include "wx/validate.h"
 #endif
 
     #include "wx/validate.h"
 #endif
 


@@ -54,9 +55,9 @@ bool wxStaticText::Create(wxWindow *parent,
 {
     if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
         return false;
 {
     if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
         return false;

-        
+

     SetLabel(label);
     SetLabel(label);

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

 
     return true;
 }
 
     return true;
 }


@@ -65,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);


@@ -90,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