summaryrefslogtreecommitdiffstats
path: root/generic/ttk
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2012-08-08 10:56:04 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2012-08-08 10:56:04 (GMT)
commit7e939fd5ee197e9660052a6351e6b2ea501fafb5 (patch)
tree1e832456672c8f3df4fbfe96b51e7d9c06f73427 /generic/ttk
parent25d454344e3782af50e4de2b30951409e349dc07 (diff)
parentf531aed3d3a538cc2ea2614e6c590813fa85c008 (diff)
downloadtk-7e939fd5ee197e9660052a6351e6b2ea501fafb5.zip
tk-7e939fd5ee197e9660052a6351e6b2ea501fafb5.tar.gz
tk-7e939fd5ee197e9660052a6351e6b2ea501fafb5.tar.bz2
merge trunk
Diffstat (limited to 'generic/ttk')
-rw-r--r--generic/ttk/ttkEntry.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index 5d0a435..136d4af 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