summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-05 07:41:20 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-05 07:41:20 (GMT)
commit01d203705e3d97a96e794e0b54e79508e285c3c2 (patch)
tree4f014949f73005c3d6513b041d6c78e0bdc10a76
parent1cd7efa2147112cf8ef4194985bfc1c24b622aa5 (diff)
parent4e1d1269673ab48c37c3da8f289e756f26f6a0e5 (diff)
downloadtk-01d203705e3d97a96e794e0b54e79508e285c3c2.zip
tk-01d203705e3d97a96e794e0b54e79508e285c3c2.tar.gz
tk-01d203705e3d97a96e794e0b54e79508e285c3c2.tar.bz2
Fix [3613759] ttk::entry and symbolic index names.
-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 {