Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Backport of dgp fixes to trunk for Tk-Cocoa |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | core-8-5-branch |
| Files: | files | file ages | folders |
| SHA1: |
964072eee33301904d48ccfd23d68b39 |
| User & Date: | kevin_walzer 2012-09-25 15:02:22 |
Context
|
2012-09-25
| ||
| 15:15 | Test for XftFontOpen in Xft library, not FT_New_Face check-in: 4d50f30c user: jan.nijtmans tags: core-8-5-branch | |
| 15:02 | Backport of dgp fixes to trunk for Tk-Cocoa check-in: 964072ee user: kevin_walzer tags: core-8-5-branch | |
| 14:51 | Merge Tk-Cocoa backport into core-8-5-branch check-in: 1a739d63 user: kevin_walzer tags: core-8-5-branch | |
Changes
Changes to macosx/tkMacOSXFont.c.
| ︙ | ︙ | |||
881 882 883 884 885 886 887 |
width = CTLineGetTypographicBounds(line, NULL, NULL, NULL);
CFRelease(line);
}
/* The call to CTTypesetterSuggestClusterBreak above will always
return at least one character regardless of whether it exceeded
it or not. Clean that up now. */
| | | 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 |
width = CTLineGetTypographicBounds(line, NULL, NULL, NULL);
CFRelease(line);
}
/* 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(flags & TK_AT_LEAST_ONE)) {
range.length = --index;
line = CTTypesetterCreateLine(typesetter, range);
width = CTLineGetTypographicBounds(line, NULL, NULL, NULL);
CFRelease(line);
}
}
|
| ︙ | ︙ |
Changes to macosx/tkMacOSXWm.c.
| ︙ | ︙ | |||
1637 1638 1639 1640 1641 1642 1643 |
Tcl_Obj *const objv[]) /* Argument objects. */
{
register Tk_Window frameWin = (Tk_Window)winPtr;
if (Tk_IsTopLevel(frameWin)) {
| | > > | 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 |
Tcl_Obj *const objv[]) /* Argument objects. */
{
register Tk_Window frameWin = (Tk_Window)winPtr;
if (Tk_IsTopLevel(frameWin)) {
MacDrawable *macWin;
Tk_MakeWindowExist(winPtr);
Tk_MakeWindowExist(winPtr->parentPtr); macWin = (MacDrawable *) winPtr->window;
TkFocusJoin(winPtr);
Tk_UnmapWindow(frameWin);
TkWmDeadWindow(macWin);
RemapWindows(winPtr, macWin);
winPtr->flags &=~(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED);
|
| ︙ | ︙ |