summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2013-06-05 07:37:52 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2013-06-05 07:37:52 (GMT)
commitdc60ceac50c6ebf08cfd89ef6c5fd8100f2c27b0 (patch)
tree645d0695e3dc81812a990e00ed81a71d9855eba5
parenta3e599d5185b6fc3d98805861724b8f4c8851161 (diff)
parent8abe3033e81f3e3625c97aea38ed2095b0c63652 (diff)
downloadtk-dc60ceac50c6ebf08cfd89ef6c5fd8100f2c27b0.zip
tk-dc60ceac50c6ebf08cfd89ef6c5fd8100f2c27b0.tar.gz
tk-dc60ceac50c6ebf08cfd89ef6c5fd8100f2c27b0.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 5558afc..002c0d8 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-05-19 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tcl.m4: Fix for FreeBSD, and remove support for older
diff --git a/generic/ttk/ttkScroll.c b/generic/ttk/ttkScroll.c
index b670540..5615eef 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 {