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/ttkLayout.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/ttkLayout.c')
| -rw-r--r-- | generic/ttk/ttkLayout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/ttk/ttkLayout.c b/generic/ttk/ttkLayout.c index 55e29f2..2dbdfdf 100644 --- a/generic/ttk/ttkLayout.c +++ b/generic/ttk/ttkLayout.c @@ -5,7 +5,7 @@ * * Copyright (c) 2003 Joe English. Freely redistributable. * - * $Id: ttkLayout.c,v 1.6 2007/01/11 15:35:40 dkf Exp $ + * $Id: ttkLayout.c,v 1.7 2007/01/11 19:59:26 jenglish Exp $ */ #include <string.h> @@ -1073,7 +1073,7 @@ static void Ttk_DrawNodeList( for (; node; node = node->next) { int border = node->flags & TTK_BORDER; - Ttk_State substate = state; + int substate = state; if (node->flags & TTK_UNIT) substate |= node->state; |