summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <jan.nijtmans@noemail.net>2013-06-05 07:41:20 (GMT)
committerjan.nijtmans <jan.nijtmans@noemail.net>2013-06-05 07:41:20 (GMT)
commitc79478bc9e0b542c0f585ae70d4709a5fcd99454 (patch)
tree4f014949f73005c3d6513b041d6c78e0bdc10a76
parentcca10a8a1a3698fa67e639cdcf0da06104d4b069 (diff)
parentfb2cacc17300a2a8355e3b46039889d8d0ab0351 (diff)
downloadtk-c79478bc9e0b542c0f585ae70d4709a5fcd99454.zip
tk-c79478bc9e0b542c0f585ae70d4709a5fcd99454.tar.gz
tk-c79478bc9e0b542c0f585ae70d4709a5fcd99454.tar.bz2
Fix [3613759] ttk::entry and symbolic index names.
FossilOrigin-Name: fcb508e321c35bbd9e4342ebba2b40ee26155629
-rw-r--r--ChangeLog5
-rw-r--r--generic/ttk/ttkScroll.c7
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e6a74da..dbbc026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-05 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/ttk/ttkScroll.c: [Bug 3613759]: ttk::entry and symbolic
+ index names.
+
2013-06-04 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tcl.m4: Eliminate NO_VIZ macro as current
diff --git a/generic/ttk/ttkScroll.c b/generic/ttk/ttkScroll.c
index 7ac4f14..2ff3d8e 100644
--- a/generic/ttk/ttkScroll.c
+++ b/generic/ttk/ttkScroll.c
@@ -34,7 +34,7 @@
* TtkScrollbarUpdateRequired, which will invoke step (5) (@@@ Fix this)
*/
-#include <tk.h>
+#include <tkInt.h>
#include "ttkTheme.h"
#include "ttkWidget.h"
@@ -202,7 +202,10 @@ int TtkScrollviewCommand(
Tcl_SetObjResult(interp, Tcl_NewListObj(2, result));
return TCL_OK;
} else if (objc == 3) {
- if (Tcl_GetIntFromObj(interp, objv[2], &newFirst) != TCL_OK) {
+ const char *string = Tcl_GetString(objv[2]);
+ if (strcmp(string, "end") == 0) {
+ newFirst = s->total;
+ } else if (Tcl_GetIntFromObj(interp, objv[2], &newFirst) != TCL_OK) {
return TCL_ERROR;
}
} else {