Bug fix. See extended.

* Added bRetMaxWidthIfWrapped parm to Str_MeasureTextWrap (). =
Sometimes, for aesthetics, the caller wants the rect extend to iMaxWidth
when text is wrapped.
* This function was not actually measuring the text height correctly.