Tk Source Code

Check-in [2fe193d1]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix regression in cutting/pasting text; thanks to Adrian Robert for patch
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | tk-cocoa-8-5-backport
Files: files | file ages | folders
SHA1: 2fe193d13412005f25b797b7452fd9992850550a
User & Date: kevin_walzer 2012-08-07 21:49:29
Context
2012-08-08
19:27
merge core-8-5-branch check-in: 02b2a8e7 user: jan.nijtmans tags: tk-cocoa-8-5-backport
2012-08-07
21:49
Fix regression in cutting/pasting text; thanks to Adrian Robert for patch check-in: 2fe193d1 user: kevin_walzer tags: tk-cocoa-8-5-backport
2012-08-06
02:48
Fixes for menu and wm fullscreen bugs; thanks to Adrian Robert for patches check-in: 5393f608 user: kevin_walzer tags: tk-cocoa-8-5-backport
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to macosx/tkMacOSXEmbed.c.

155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
	    /*
	     * This will be set when we are mapped.
	     */

	    macWin->xOff = 0;
	    macWin->yOff = 0;
	    macWin->toplevel = macWin;
	} else {
	    macWin->xOff = winPtr->parentPtr->privatePtr->xOff +
		    winPtr->parentPtr->changes.border_width +
		    winPtr->changes.x;
	    macWin->yOff = winPtr->parentPtr->privatePtr->yOff +
		    winPtr->parentPtr->changes.border_width +
		    winPtr->changes.y;
	    macWin->toplevel = winPtr->parentPtr->privatePtr->toplevel;







|







155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
	    /*
	     * This will be set when we are mapped.
	     */

	    macWin->xOff = 0;
	    macWin->yOff = 0;
	    macWin->toplevel = macWin;
	} else if (winPtr->parentPtr) {
	    macWin->xOff = winPtr->parentPtr->privatePtr->xOff +
		    winPtr->parentPtr->changes.border_width +
		    winPtr->changes.x;
	    macWin->yOff = winPtr->parentPtr->privatePtr->yOff +
		    winPtr->parentPtr->changes.border_width +
		    winPtr->changes.y;
	    macWin->toplevel = winPtr->parentPtr->privatePtr->toplevel;