summaryrefslogtreecommitdiffstats
path: root/generic/ttk/ttkEntry.c
diff options
context:
space:
mode:
authordkf <dkf@noemail.net>2012-08-08 10:56:04 (GMT)
committerdkf <dkf@noemail.net>2012-08-08 10:56:04 (GMT)
commitb16e7b84e7a1b35c8d6eb37569dec0fce23df2f0 (patch)
tree1e832456672c8f3df4fbfe96b51e7d9c06f73427 /generic/ttk/ttkEntry.c
parent38580505599388462eb75b8c410fe63f2a9d5cf2 (diff)
parentb9b6739169a8a798512cb41f1e7348c59596f24d (diff)
downloadtk-b16e7b84e7a1b35c8d6eb37569dec0fce23df2f0.zip
tk-b16e7b84e7a1b35c8d6eb37569dec0fce23df2f0.tar.gz
tk-b16e7b84e7a1b35c8d6eb37569dec0fce23df2f0.tar.bz2
merge trunk
FossilOrigin-Name: 5a29e1db18e70efa953a885f129e7990cd86c1e0
Diffstat (limited to 'generic/ttk/ttkEntry.c')
-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