Fix out of bounds string access in wxMSW wxDirDialog.

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

diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp
index 8521014b48ee628023405fa07a7325b19869a9d1..e4449268a9951607f9d0975ee7cbc9f30945ebd7 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:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "univstattext.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


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


@@ -42,8 +39,6 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_ABSTRACT_CLASS(wxStaticText, wxControl)
-

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


@@ -57,41 +52,45 @@ bool wxStaticText::Create(wxWindow *parent,
                           const wxString &name)
 {
     if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
                           const wxString &name)
 {
     if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )

-        return FALSE;
-        
+        return false;
+

     SetLabel(label);
     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