diff options
| author | kevin_walzer <kevin_walzer@noemail.net> | 2012-09-25 15:02:22 (GMT) |
|---|---|---|
| committer | kevin_walzer <kevin_walzer@noemail.net> | 2012-09-25 15:02:22 (GMT) |
| commit | 0458cb22012a2d43561907bcf954d0b130f23746 (patch) | |
| tree | a14fcdac13403624a5b4d4989b5ba09c60b69a2e /macosx | |
| parent | 5f46bda6dc44ef146b4444d218c12784d33c0305 (diff) | |
| download | tk-0458cb22012a2d43561907bcf954d0b130f23746.zip tk-0458cb22012a2d43561907bcf954d0b130f23746.tar.gz tk-0458cb22012a2d43561907bcf954d0b130f23746.tar.bz2 | |
Backport of dgp fixes to trunk for Tk-Cocoa
FossilOrigin-Name: 964072eee33301904d48ccfd23d68b398e63f188
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXFont.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c index 67ed044..20b8908 100644 --- a/macosx/tkMacOSXFont.c +++ b/macosx/tkMacOSXFont.c @@ -885,7 +885,7 @@ TkpMeasureCharsInContext( /* The call to CTTypesetterSuggestClusterBreak above will always return at least one character regardless of whether it exceeded it or not. Clean that up now. */ - while (width > maxWidth && !(flags & TK_PARTIAL_OK) && index > start) { + while (width > maxWidth && !(flags & TK_PARTIAL_OK) && index > start(flags & TK_AT_LEAST_ONE)) { range.length = --index; line = CTTypesetterCreateLine(typesetter, range); width = CTLineGetTypographicBounds(line, NULL, NULL, NULL); diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 22c95e9..e56c0e7 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -1641,7 +1641,9 @@ WmForgetCmd( if (Tk_IsTopLevel(frameWin)) { - MacDrawable *macWin = (MacDrawable *) winPtr->parentPtr->window; + MacDrawable *macWin; + Tk_MakeWindowExist(winPtr); + Tk_MakeWindowExist(winPtr->parentPtr); macWin = (MacDrawable *) winPtr->window; TkFocusJoin(winPtr); Tk_UnmapWindow(frameWin); TkWmDeadWindow(macWin); |