Use CallGetTextExtent() directly in GetMultiLineTextExtent()
There is no need to pass by GetTextExtent() now that we already make sure width/height are non-null in this function, so just construct the MeasuringGuard slightly earlier and call CallGetTextExtent() directly. No real changes.
This commit is contained in:
@@ -123,18 +123,18 @@ void wxTextMeasureBase::GetMultiLineTextExtent(const wxString& text,
|
||||
*width = 0;
|
||||
*height = 0;
|
||||
|
||||
MeasuringGuard guard(*this);
|
||||
|
||||
// It's noticeably faster to handle the case of a string which isn't
|
||||
// actually multiline specially here, to skip iteration above in this case.
|
||||
if ( text.find('\n') == wxString::npos )
|
||||
{
|
||||
GetTextExtent(text, width, height);
|
||||
CallGetTextExtent(text, width, height);
|
||||
if ( heightOneLine )
|
||||
*heightOneLine = *height;
|
||||
return;
|
||||
}
|
||||
|
||||
MeasuringGuard guard(*this);
|
||||
|
||||
wxCoord widthLine, heightLine = 0, heightLineDefault = 0;
|
||||
|
||||
wxString::const_iterator lineStart = text.begin();
|
||||
|
Reference in New Issue
Block a user