From: Vadim Zeitlin Date: Sun, 12 Nov 2006 20:06:56 +0000 (+0000) Subject: made GetMultiLineTextExtent() const (part of patch 1595123) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/169147c8be2d1a13e95aaa24259f83232aec8de9?ds=sidebyside made GetMultiLineTextExtent() const (part of patch 1595123) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/dc.h b/include/wx/dc.h index dbe62c4d95..da5bc5fde0 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -446,7 +446,7 @@ public: wxCoord *width, wxCoord *height, wxCoord *heightLine = NULL, - wxFont *font = NULL); + wxFont *font = NULL) const; // Measure cumulative width of text after each character bool GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index 52359ee586..4df3396d2c 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -471,7 +471,7 @@ void wxDCBase::GetMultiLineTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord *h, - wxFont *font) + wxFont *font) const { wxCoord widthTextMax = 0, widthLine, heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;