diff options
| author | jenglish@flightlab.com <jenglish> | 2007-01-11 19:59:26 (GMT) |
|---|---|---|
| committer | jenglish@flightlab.com <jenglish> | 2007-01-11 19:59:26 (GMT) |
| commit | f0d3595b2e596e8e105311a199ad1434b3451ef9 (patch) | |
| tree | 8277dd861a947f2adb0b4634f031f9c651f7e8d0 /generic/ttk/ttkLabel.c | |
| parent | f8e1df560a607ac6ab0c201122d1f5a5ec1590a2 (diff) | |
| download | tk-f0d3595b2e596e8e105311a199ad1434b3451ef9.zip tk-f0d3595b2e596e8e105311a199ad1434b3451ef9.tar.gz tk-f0d3595b2e596e8e105311a199ad1434b3451ef9.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/ttkLabel.c')
| -rw-r--r-- | generic/ttk/ttkLabel.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c index debe10c..8dd1c63 100644 --- a/generic/ttk/ttkLabel.c +++ b/generic/ttk/ttkLabel.c @@ -1,4 +1,4 @@ -/* $Id: ttkLabel.c,v 1.6 2007/01/11 15:35:40 dkf Exp $ +/* $Id: ttkLabel.c,v 1.7 2007/01/11 19:59:26 jenglish Exp $ * * text, image, and label elements. * @@ -233,8 +233,7 @@ static void ImageTextElementDraw( return; XFillRectangle(Tk_Display(tkwin), d, - Tk_3DBorderGC(tkwin, bd, TK_3D_FLAT_GC), b.x, b.y, - (unsigned)b.width, (unsigned)b.height); + Tk_3DBorderGC(tkwin, bd, TK_3D_FLAT_GC), b.x, b.y, b.width, b.height); TextDraw(text, tkwin, d, b); TextCleanup(text); @@ -335,8 +334,7 @@ static void StippleOver( gcvalues.fill_style = FillStippled; gcvalues.stipple = stipple; gc = Tk_GetGC(tkwin, mask, &gcvalues); - XFillRectangle(Tk_Display(tkwin),d,gc,x,y, - (unsigned)image->width,(unsigned)image->height); + XFillRectangle(Tk_Display(tkwin),d,gc,x,y,image->width,image->height); Tk_FreeGC(Tk_Display(tkwin), gc); Tk_FreeBitmapFromObj(tkwin, image->stippleObj); } |