diff options
| author | jenglish <jenglish@flightlab.com> | 2007-01-11 19:59:26 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2007-01-11 19:59:26 (GMT) |
| commit | c48f4f5bf3717299252cba2e4faa31f395ce1689 (patch) | |
| tree | 8277dd861a947f2adb0b4634f031f9c651f7e8d0 /generic/ttk/ttkDefaultTheme.c | |
| parent | 72b0a491e8d2e18f644d6698540fbe79918d17ea (diff) | |
| download | tk-c48f4f5bf3717299252cba2e4faa31f395ce1689.zip tk-c48f4f5bf3717299252cba2e4faa31f395ce1689.tar.gz tk-c48f4f5bf3717299252cba2e4faa31f395ce1689.tar.bz2 | |
Revert previous change to keep in sync with Tile codebase.
The minor warnings from GCC fixed in the previous revision
were false positives due to improper use of "-Wconversion".
Still compiles cleanly with "gcc -Wall -Werror" (gcc 3.3.5).
Diffstat (limited to 'generic/ttk/ttkDefaultTheme.c')
| -rw-r--r-- | generic/ttk/ttkDefaultTheme.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c index c27591c..ec3ad93 100644 --- a/generic/ttk/ttkDefaultTheme.c +++ b/generic/ttk/ttkDefaultTheme.c @@ -1,4 +1,4 @@ -/* $Id: ttkDefaultTheme.c,v 1.6 2007/01/11 15:35:40 dkf Exp $ +/* $Id: ttkDefaultTheme.c,v 1.7 2007/01/11 19:59:26 jenglish Exp $ * * Copyright (c) 2003, Joe English * @@ -297,8 +297,8 @@ BorderElementDraw( if (defaultState == TTK_BUTTON_DEFAULT_ACTIVE) { GC gc = Tk_GCForColor(borderColor, d); - XDrawRectangle(Tk_Display(tkwin), d, gc, - b.x, b.y, (unsigned)b.width-1, (unsigned)b.height-1); + XDrawRectangle(Tk_Display(tkwin), d, gc, + b.x, b.y, b.width-1, b.height-1); } if (defaultState != TTK_BUTTON_DEFAULT_DISABLED) { /* Space for default ring: */ @@ -578,12 +578,11 @@ static void IndicatorElementDraw( /* * Copy onto our target drawable surface. */ - memset(&gcValues, 0, sizeof(gcValues)); copyGC = Tk_GetGC(tkwin, 0, &gcValues); TkPutImage(NULL, 0, display, d, copyGC, img, 0, 0, b.x, b.y, - (unsigned)spec->width, (unsigned)spec->height); + spec->width, spec->height); /* * Tidy up. @@ -1085,7 +1084,7 @@ static void TreeitemIndicatorDraw( b = Ttk_PadBox(b, padding); XDrawRectangle(Tk_Display(tkwin), d, gc, - b.x, b.y, (unsigned)b.width - 1, (unsigned)b.height - 1); + b.x, b.y, b.width - 1, b.height - 1); cx = b.x + (b.width - 1) / 2; cy = b.y + (b.height - 1) / 2; |