summaryrefslogtreecommitdiffstats
path: root/generic/tkInt.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-05-22 20:24:16 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-05-22 20:24:16 (GMT)
commitd0565eba5df7fbf569a9fab0415bb0391dedbf29 (patch)
treede2e6835100305af64f4d7acc895f61633eb5529 /generic/tkInt.h
parent44f5fc24fed3e8fce2accea8bd57a5998c3829b5 (diff)
parent768dc7a8b3c95b48626f3a263e7008350e829b51 (diff)
downloadtk-bug_4955f5d8a4.zip
tk-bug_4955f5d8a4.tar.gz
tk-bug_4955f5d8a4.tar.bz2
merge trunkbug_4955f5d8a4
Diffstat (limited to 'generic/tkInt.h')
-rw-r--r--generic/tkInt.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index b71e9b9..7279096 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1110,8 +1110,9 @@ MODULE_SCOPE int Tk_RaiseObjCmd(ClientData clientData,
MODULE_SCOPE int Tk_ScaleObjCmd(ClientData clientData,
Tcl_Interp *interp, int objc,
Tcl_Obj *const objv[]);
-MODULE_SCOPE int Tk_ScrollbarCmd(ClientData clientData,
- Tcl_Interp *interp, int argc, const char **argv);
+MODULE_SCOPE int Tk_ScrollbarObjCmd(ClientData clientData,
+ Tcl_Interp *interp, int objc,
+ Tcl_Obj *const objv[]);
MODULE_SCOPE int Tk_SelectionObjCmd(ClientData clientData,
Tcl_Interp *interp, int objc,
Tcl_Obj *const objv[]);
@@ -1151,8 +1152,8 @@ MODULE_SCOPE void TkFreeGeometryMaster(Tk_Window tkwin,
MODULE_SCOPE void TkEventInit(void);
MODULE_SCOPE void TkRegisterObjTypes(void);
-MODULE_SCOPE int TkDeadAppCmd(ClientData clientData,
- Tcl_Interp *interp, int argc, const char **argv);
+MODULE_SCOPE int TkDeadAppObjCmd(ClientData clientData,
+ Tcl_Interp *interp, int objc, Tcl_Obj *const argv[]);
MODULE_SCOPE int TkCanvasGetCoordObj(Tcl_Interp *interp,
Tk_Canvas canvas, Tcl_Obj *obj,
double *doublePtr);