Tk Source Code

Check-in [4e6e60ab]
Login

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

Overview
Comment: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
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-5-branch
Files: files | file ages | folders
SHA1: 4e6e60ab4cb82e2e5c10d77f1e8b41ae2bc76bbf
User & Date: kevin_walzer 2013-09-16 01:59:36
Context
2013-09-18
19:13
merge release check-in: a615c82b user: dgp tags: core-8-5-branch
2013-09-16
13:53
merge-mark check-in: 24fd88fe user: jan.nijtmans tags: trunk
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-08-26
11:00
Bug [c597acdab3]: Call [$pb step] in tail position in ttk::progressbar::Autoincrement, so that the widget is in a consistent state when any write traces on the linked -variable are fired check-in: 35fd9c96 user: jan.nijtmans tags: core-8-5-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

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 --
 *