summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2007-11-18 17:28:02 (GMT)
committerjenglish <jenglish@flightlab.com>2007-11-18 17:28:02 (GMT)
commitd9b51f4b71e2318378ed9a818970213c3b381894 (patch)
tree6666175e7b8faaad4de67cf4953decd88280e501
parent4ad83bd93fe8524743876ffe369a5165bc2fd44c (diff)
downloadtk-d9b51f4b71e2318378ed9a818970213c3b381894.zip
tk-d9b51f4b71e2318378ed9a818970213c3b381894.tar.gz
tk-d9b51f4b71e2318378ed9a818970213c3b381894.tar.bz2
BUGFIX: Ttk_GetPaddingFromObj() and Ttk_GetBorderFromObj() returned garbage
when passed an empty list.
-rw-r--r--ChangeLog6
-rw-r--r--generic/ttk/ttkLayout.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c4c37c4..cd5e0c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-11-18 Joe English <jenglish@users.sourceforge.net>
+ * generic/ttk/ttkLayout.c(TTKInitPadding): BUGFIX:
+ Ttk_GetPaddingFromObj() and Ttk_GetBorderFromObj() returned
+ garbage when passed an empty list.
+
+2007-11-18 Joe English <jenglish@users.sourceforge.net>
+
* macosx/ttkMacOSXTheme.c: Resynchronize with Tile codebase
so that patches can flow back and forth.
diff --git a/generic/ttk/ttkLayout.c b/generic/ttk/ttkLayout.c
index ca1a6e9..76754e7 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.8 2007/03/21 20:06:41 jenglish Exp $
+ * $Id: ttkLayout.c,v 1.9 2007/11/18 17:28:02 jenglish Exp $
*/
#include <string.h>
@@ -280,6 +280,7 @@ static void TTKInitPadding(int padc, int pixels[4], Ttk_Padding *pad)
{
switch (padc)
{
+ case 0: pixels[0] = 0; /*FALLTHRU*/
case 1: pixels[1] = pixels[0]; /*FALLTHRU*/
case 2: pixels[2] = pixels[0]; /*FALLTHRU*/
case 3: pixels[3] = pixels[1]; /*FALLTHRU*/