diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-02-07 09:35:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-02-07 09:35:04 (GMT) |
| commit | e82adc446bb013824accb5b95f22129e0a5267a7 (patch) | |
| tree | aa57c0894278df797f18d17bdaa56dc4b9381a2d /win | |
| parent | 294e8b450c748fcc35e2f76489d71459df5153cd (diff) | |
| parent | 8d6df717b42ddf4ef40167646105da4d5134b824 (diff) | |
| download | tk-e82adc446bb013824accb5b95f22129e0a5267a7.zip tk-e82adc446bb013824accb5b95f22129e0a5267a7.tar.gz tk-e82adc446bb013824accb5b95f22129e0a5267a7.tar.bz2 | |
Merge trunk
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 2 | ||||
| -rw-r--r-- | win/tcl.m4 | 2 | ||||
| -rw-r--r-- | win/ttkWinTheme.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/win/configure b/win/configure index a663274..fa0d3e6 100755 --- a/win/configure +++ b/win/configure @@ -4267,7 +4267,7 @@ $as_echo "using shared flags" >&6; } CFLAGS_DEBUG=-g CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" - CFLAGS_WARNING="-Wextra -Wwrite-strings -Wpointer-arith" + CFLAGS_WARNING="-Wall -Wextra -Wwrite-strings -Wpointer-arith" LDFLAGS_DEBUG= LDFLAGS_OPTIMIZE= @@ -685,7 +685,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ CFLAGS_DEBUG=-g CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" - CFLAGS_WARNING="-Wextra -Wwrite-strings -Wpointer-arith" + CFLAGS_WARNING="-Wall -Wextra -Wwrite-strings -Wpointer-arith" LDFLAGS_DEBUG= LDFLAGS_OPTIMIZE= diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c index 3ac93ad..e050a71 100644 --- a/win/ttkWinTheme.c +++ b/win/ttkWinTheme.c @@ -325,7 +325,7 @@ static void ButtonBorderElementSize( { ButtonBorderElement *bd = (ButtonBorderElement *)elementRecord; int relief = TK_RELIEF_RAISED; - int defaultState = TTK_BUTTON_DEFAULT_DISABLED; + Ttk_ButtonDefaultState defaultState = TTK_BUTTON_DEFAULT_DISABLED; short int cx, cy; (void)dummy; (void)tkwin; @@ -357,7 +357,7 @@ static void ButtonBorderElementDraw( { ButtonBorderElement *bd = (ButtonBorderElement *)elementRecord; int relief = TK_RELIEF_FLAT; - int defaultState = TTK_BUTTON_DEFAULT_DISABLED; + Ttk_ButtonDefaultState defaultState = TTK_BUTTON_DEFAULT_DISABLED; TkWinDCState dcState; HDC hdc; RECT rc; |