diff options
author | patthoyts <patthoyts@users.sourceforge.net> | 2007-11-19 18:49:58 (GMT) |
---|---|---|
committer | patthoyts <patthoyts@users.sourceforge.net> | 2007-11-19 18:49:58 (GMT) |
commit | 7d8887a5c1131402a85c7ef45899e28b85561a91 (patch) | |
tree | 3955729456b455c13e33b835751e6723f0fb8359 | |
parent | 86ca756db7520c030a65f1198ee3a1b8443270ec (diff) | |
download | tk-7d8887a5c1131402a85c7ef45899e28b85561a91.zip tk-7d8887a5c1131402a85c7ef45899e28b85561a91.tar.gz tk-7d8887a5c1131402a85c7ef45899e28b85561a91.tar.bz2 |
Fixed crash bug in style element create
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | generic/ttk/ttkTheme.c | 4 | ||||
-rw-r--r-- | tests/ttk/ttk.test | 13 |
3 files changed, 20 insertions, 2 deletions
@@ -14,6 +14,11 @@ * changes: Update changes for 8.5b3 release. +2007-11-19 Pat Thoyts <patthoyts@users.sourceforge.net> + + * generic/ttk/ttkTheme.c: Fixed crash when 'style element create' + * tests/ttk/ttk.test: called with insufficient args. Plus tests. + 2007-11-18 Joe English <jenglish@users.sourceforge.net> * generic/ttk/ttkElements.c, macosx/ttkMacOSXTheme.c: Add "fill" diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c index 74ffcf0..de63d71 100644 --- a/generic/ttk/ttkTheme.c +++ b/generic/ttk/ttkTheme.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * $Id: ttkTheme.c,v 1.7 2007/11/08 01:40:25 jenglish Exp $ + * $Id: ttkTheme.c,v 1.8 2007/11/19 18:49:59 patthoyts Exp $ */ #include <stdlib.h> @@ -1460,7 +1460,7 @@ static int StyleElementCreateCmd( FactoryRec *recPtr; if (objc < 5) { - Tcl_WrongNumArgs(interp, 5, objv, "name type ?options...?"); + Tcl_WrongNumArgs(interp, 3, objv, "name type ?options...?"); return TCL_ERROR; } diff --git a/tests/ttk/ttk.test b/tests/ttk/ttk.test index 4f91eb0..cd3291b 100644 --- a/tests/ttk/ttk.test +++ b/tests/ttk/ttk.test @@ -587,6 +587,19 @@ test ttk-14.3 "-textvariable in nonexistant namespace" -body { -match glob -cleanup { destroy .tw } +test ttk-15.1 "style element create: insufficient args" -body { + ttk::style element create +} -returnCodes 1 -match glob -result "wrong # args:*" +test ttk-15.2 "style element create: insufficient args" -body { + ttk::style element create plain.background +} -returnCodes 1 -match glob -result "wrong # args:*" +test ttk-15.3 "style element create: insufficient args" -body { + ttk::style element create plain.background from +} -returnCodes 1 -match glob -result "wrong # args:*" +test ttk-15.4 "style element create: valid" -body { + ttk::style element create plain.background from default +} -returnCodes 0 -result "" + eval destroy [winfo children .] tcltest::cleanupTests |