diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-09-14 15:03:36 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-09-14 15:03:36 (GMT) |
| commit | a8512fc0800ca93149c86ad526313794ea16be36 (patch) | |
| tree | bf5c160a96385cbbfa85adeb08dea3460d3ba323 /generic | |
| parent | 970db01541fa840ec5e11fa8178a154ee94d5d9f (diff) | |
| parent | e829dc68c26b7b313b94f777def7bb49c471422b (diff) | |
| download | tk-a8512fc0800ca93149c86ad526313794ea16be36.zip tk-a8512fc0800ca93149c86ad526313794ea16be36.tar.gz tk-a8512fc0800ca93149c86ad526313794ea16be36.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/ttk/ttkEntry.c | 10 | ||||
| -rw-r--r-- | generic/ttk/ttkLabel.c | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c index 5ef7f81..a962662 100644 --- a/generic/ttk/ttkEntry.c +++ b/generic/ttk/ttkEntry.c @@ -1151,7 +1151,9 @@ static GC EntryGetGC(Entry *entryPtr, Tcl_Obj *colorObj, TkRegion clip) mask |= GCForeground; } gc = Tk_GetGC(entryPtr->core.tkwin, mask, &gcValues); - TkSetRegion(Tk_Display(entryPtr->core.tkwin), gc, clip); + if (clip != None) { + TkSetRegion(Tk_Display(entryPtr->core.tkwin), gc, clip); + } return gc; } @@ -1254,7 +1256,7 @@ static void EntryDisplay(void *clientData, Drawable d) gc = EntryGetGC(entryPtr, es.insertColorObj, clipRegion); XFillRectangle(Tk_Display(tkwin), d, gc, cursorX-cursorWidth/2, cursorY, cursorWidth, cursorHeight); - TkSetRegion(Tk_Display(tkwin), gc, None); + XSetClipMask(Tk_Display(tkwin), gc, None); Tk_FreeGC(Tk_Display(tkwin), gc); } @@ -1265,7 +1267,7 @@ static void EntryDisplay(void *clientData, Drawable d) Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout, entryPtr->entry.layoutX, entryPtr->entry.layoutY, leftIndex, rightIndex); - TkSetRegion(Tk_Display(tkwin), gc, None); + XSetClipMask(Tk_Display(tkwin), gc, None); Tk_FreeGC(Tk_Display(tkwin), gc); /* Overwrite the selected portion (if any) in the -selectforeground color: @@ -1276,7 +1278,7 @@ static void EntryDisplay(void *clientData, Drawable d) Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout, entryPtr->entry.layoutX, entryPtr->entry.layoutY, selFirst, selLast); - TkSetRegion(Tk_Display(tkwin), gc, None); + XSetClipMask(Tk_Display(tkwin), gc, None); Tk_FreeGC(Tk_Display(tkwin), gc); } diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c index 0f554a6..0f71970 100644 --- a/generic/ttk/ttkLabel.c +++ b/generic/ttk/ttkLabel.c @@ -185,8 +185,8 @@ static void TextDraw(TextElement *text, Tk_Window tkwin, Drawable d, Ttk_Box b) #ifdef HAVE_XFT TkUnixSetXftClipRegion(None); #endif - TkSetRegion(Tk_Display(tkwin), gc1, None); - TkSetRegion(Tk_Display(tkwin), gc2, None); + XSetClipMask(Tk_Display(tkwin), gc1, None); + XSetClipMask(Tk_Display(tkwin), gc2, None); TkDestroyRegion(clipRegion); } Tk_FreeGC(Tk_Display(tkwin), gc1); |