Tk Source Code

Check-in [a1861dff]
Login

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

Overview
Comment:merge 8.5; update changes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-5-15 | core-8-5-15-rc
Files: files | file ages | folders
SHA1: a1861dff67d74660f3bcfca992c1eb54c707bb64
User & Date: dgp 2013-09-16 13:31:53
Context
2013-09-18
19:13
merge release check-in: a615c82b user: dgp tags: core-8-5-branch
2013-09-16
13:31
merge 8.5; update changes Closed-Leaf check-in: a1861dff user: dgp tags: core-8-5-15, core-8-5-15-rc
01:59
Fix for http://core.tcl.tk/tk/info/8eb56719cf on broken build with 8.5.15 with clang on OS X, thanks to Ned Deily for patch check-in: 4e6e60ab user: kevin_walzer tags: core-8-5-branch
2013-09-13
16:06
Added note to ChangeLog pointing to the fossil timeline for better logging. check-in: 1617028d user: dgp tags: core-8-5-15-rc
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to changes.

6904
6905
6906
6907
6908
6909
6910


6911

2013-07-02 (bug fix)[32afa6] corrected dirent64 check (griffin)

2013-08-25 (bug fix)[3016181] Cocoa: [destroy $scrollbar] => crash (goddard)

2013-08-26 (bug fix)[c597acd] [$pb step] work with traces (english)



--- Released 8.5.15, September 16, 2013 --- http://core.tcl.tk/tk/ for details







>
>
|
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913

2013-07-02 (bug fix)[32afa6] corrected dirent64 check (griffin)

2013-08-25 (bug fix)[3016181] Cocoa: [destroy $scrollbar] => crash (goddard)

2013-08-26 (bug fix)[c597acd] [$pb step] work with traces (english)

2013-09-15 (bug fix)[8eb5671] macosx Tk compile errors w/clang (deily)

--- Released 8.5.15, September 18, 2013 --- http://core.tcl.tk/tk/ for details

Changes to macosx/tkMacOSXClipboard.c.

164
165
166
167
168
169
170

171
172
173
174
175
176
177
    if (dispPtr && selection == dispPtr->clipboardAtom) {
	clipboardOwner = owner ? Tk_IdToWindow(display, owner) : NULL;
	if (!dispPtr->clipboardActive) {
	    NSPasteboard *pb = [NSPasteboard generalPasteboard];
	    changeCount = [pb declareTypes:[NSArray array] owner:NSApp];
	}
    }

}

/*
 *----------------------------------------------------------------------
 *
 * TkMacOSXSelDeadWindow --
 *







>







164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
    if (dispPtr && selection == dispPtr->clipboardAtom) {
	clipboardOwner = owner ? Tk_IdToWindow(display, owner) : NULL;
	if (!dispPtr->clipboardActive) {
	    NSPasteboard *pb = [NSPasteboard generalPasteboard];
	    changeCount = [pb declareTypes:[NSArray array] owner:NSApp];
	}
    }
    return Success;
}

/*
 *----------------------------------------------------------------------
 *
 * TkMacOSXSelDeadWindow --
 *
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
void
TkMacOSXSelDeadWindow(
    TkWindow *winPtr)
{
    if (winPtr && winPtr == (TkWindow *)clipboardOwner) {
	clipboardOwner = NULL;
    }
    return Success;
}

/*
 *----------------------------------------------------------------------
 *
 * TkSelUpdateClipboard --
 *







<







191
192
193
194
195
196
197

198
199
200
201
202
203
204
void
TkMacOSXSelDeadWindow(
    TkWindow *winPtr)
{
    if (winPtr && winPtr == (TkWindow *)clipboardOwner) {
	clipboardOwner = NULL;
    }

}

/*
 *----------------------------------------------------------------------
 *
 * TkSelUpdateClipboard --
 *

Changes to macosx/tkMacOSXDraw.c.

343
344
345
346
347
348
349

350
351
352
353
354
355
356
	} else {
	    TkMacOSXDbgMsg("Invalid source drawable");
	}
    } else {
	TkMacOSXDbgMsg("Invalid destination drawable");
    }
    TkMacOSXRestoreDrawingContext(&dc);

}

/*
 *----------------------------------------------------------------------
 *
 * CreateCGImageWithXImage --
 *







>







343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
	} else {
	    TkMacOSXDbgMsg("Invalid source drawable");
	}
    } else {
	TkMacOSXDbgMsg("Invalid destination drawable");
    }
    TkMacOSXRestoreDrawingContext(&dc);
    return Success;
}

/*
 *----------------------------------------------------------------------
 *
 * CreateCGImageWithXImage --
 *
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
	}*/
	if (subImage) {
	    CFRelease(subImage);
	}
    } else {
	TkMacOSXDbgMsg("Drawing of empty CGImage requested");
    }
    return Success;
}

/*
 *----------------------------------------------------------------------
 *
 * XDrawLines --
 *







<







741
742
743
744
745
746
747

748
749
750
751
752
753
754
	}*/
	if (subImage) {
	    CFRelease(subImage);
	}
    } else {
	TkMacOSXDbgMsg("Drawing of empty CGImage requested");
    }

}

/*
 *----------------------------------------------------------------------
 *
 * XDrawLines --
 *