Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made GetMultiLineTextExtent() const (part of patch 1595123)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-12 20:06:56 +00:00
parent 471a67a7e7
commit 169147c8be
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dc.h
View File

@@ -446,7 +446,7 @@ public:
wxCoord *width, wxCoord *width,
wxCoord *height, wxCoord *height,
wxCoord *heightLine = NULL, wxCoord *heightLine = NULL,
wxFont *font = NULL); wxFont *font = NULL) const;
// Measure cumulative width of text after each character // Measure cumulative width of text after each character
bool GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const bool GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const

2
src/common/dcbase.cpp
View File

@@ -471,7 +471,7 @@ void wxDCBase::GetMultiLineTextExtent(const wxString& text,
wxCoord *x, wxCoord *x,
wxCoord *y, wxCoord *y,
wxCoord *h, wxCoord *h,
wxFont *font) wxFont *font) const
{ {
wxCoord widthTextMax = 0, widthLine, wxCoord widthTextMax = 0, widthLine,
heightTextTotal = 0, heightLineDefault = 0, heightLine = 0; heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;