diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-08-02 08:18:30 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2012-08-02 08:18:30 (GMT) |
| commit | 08e368f212a67fbbd8e36d777f2b27c15237593d (patch) | |
| tree | c47dbd0ed313adb5371167f0e18f2b7a5086d05b /generic | |
| parent | 972d4f99d27a5a1a1ef635b95435f3894e702506 (diff) | |
| parent | d41528178b7ac734c7c8e6452c463ea288fd2165 (diff) | |
| download | tk-08e368f212a67fbbd8e36d777f2b27c15237593d.zip tk-08e368f212a67fbbd8e36d777f2b27c15237593d.tar.gz tk-08e368f212a67fbbd8e36d777f2b27c15237593d.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkClipboard.c | 7 | ||||
| -rw-r--r-- | generic/ttk/ttkEntry.c | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/generic/tkClipboard.c b/generic/tkClipboard.c index e153064..043c167 100644 --- a/generic/tkClipboard.c +++ b/generic/tkClipboard.c @@ -645,11 +645,8 @@ TkClipInit( * and set up an event handler for it. */ - dispPtr->clipWindow = Tk_CreateWindow(interp, NULL, "_clip", - DisplayString(dispPtr->display)); - if (dispPtr->clipWindow == NULL) { - return TCL_ERROR; - } + dispPtr->clipWindow = (Tk_Window) TkAllocWindow(dispPtr, + DefaultScreen(dispPtr->display), NULL); Tcl_Preserve(dispPtr->clipWindow); atts.override_redirect = True; Tk_ChangeWindowAttributes(dispPtr->clipWindow, CWOverrideRedirect, &atts); diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c index 6eccf51..a3d0179 100644 --- a/generic/ttk/ttkEntry.c +++ b/generic/ttk/ttkEntry.c @@ -1225,10 +1225,10 @@ static void EntryDisplay(void *clientData, Drawable d) * clipping area from the GC, so we have to supply that by other means. */ - rect.x = entryPtr->entry.layoutX; - rect.y = entryPtr->entry.layoutY; + rect.x = textarea.x; + rect.y = textarea.y; rect.width = textarea.width; - rect.height = entryPtr->entry.layoutHeight; + rect.height = textarea.height; clipRegion = TkCreateRegion(); TkUnionRectWithRegion(&rect, clipRegion, clipRegion); #ifdef HAVE_XFT |