Do some sanity checks in DoDrawText to make sure we actually have some glyphs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -107,7 +107,11 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
|
|||||||
|
|
||||||
NSRange glyphRange = [sm_cocoaNSLayoutManager glyphRangeForTextContainer:sm_cocoaNSTextContainer];
|
NSRange glyphRange = [sm_cocoaNSLayoutManager glyphRangeForTextContainer:sm_cocoaNSTextContainer];
|
||||||
NSRect usedRect = [sm_cocoaNSLayoutManager usedRectForTextContainer:sm_cocoaNSTextContainer];
|
NSRect usedRect = [sm_cocoaNSLayoutManager usedRectForTextContainer:sm_cocoaNSTextContainer];
|
||||||
|
// NOTE: We'll crash trying to get the location of glyphAtIndex:0 if
|
||||||
|
// there is no length or we don't start at zero
|
||||||
|
if(!glyphRange.length)
|
||||||
|
return;
|
||||||
|
wxASSERT_MSG(glyphRange.location==0,"glyphRange must begin at zero");
|
||||||
|
|
||||||
NSAffineTransform *transform = [NSAffineTransform transform];
|
NSAffineTransform *transform = [NSAffineTransform transform];
|
||||||
[transform translateXBy:x yBy:y];
|
[transform translateXBy:x yBy:y];
|
||||||
|
Reference in New Issue
Block a user