diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-22 22:55:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-22 22:55:23 (GMT) |
| commit | ed59d7147daad3259a832cc490d7383a0c6b2226 (patch) | |
| tree | b260fc38acfed367e5d6f2bb17fffd73f14a7b15 /generic | |
| parent | c870976a66187d10fa384363a92f7b3c6927d4b1 (diff) | |
| download | tk-ed59d7147daad3259a832cc490d7383a0c6b2226.zip tk-ed59d7147daad3259a832cc490d7383a0c6b2226.tar.gz tk-ed59d7147daad3259a832cc490d7383a0c6b2226.tar.bz2 | |
Fix [a010a249c7]: notebook-1.4 failures
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/ttk/ttkNotebook.c | 8 | ||||
| -rw-r--r-- | generic/ttk/ttkPanedwindow.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c index e8cd905..9b5a846 100644 --- a/generic/ttk/ttkNotebook.c +++ b/generic/ttk/ttkNotebook.c @@ -571,7 +571,7 @@ static void NotebookDoLayout(void *recordPtr) * Set the position and size of a child widget * based on the current client area and slave options: */ -static void NotebookPlaceSlave(Notebook *nb, int slaveIndex) +static void NotebookPlaceSlave(Notebook *nb, TkSizeT slaveIndex) { Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, slaveIndex); Tk_Window slaveWindow = Ttk_SlaveWindow(nb->notebook.mgr, slaveIndex); @@ -852,7 +852,7 @@ static int FindTabIndex( { return TCL_OK; } - if (*index_rtn == Ttk_NumberSlaves(nb->notebook.mgr)) { + if (*index_rtn == (int)Ttk_NumberSlaves(nb->notebook.mgr)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "Invalid slave specification %s", string)); Tcl_SetErrorCode(interp, "TTK", "SLAVE", "SPEC", NULL); @@ -873,7 +873,7 @@ static int GetTabIndex( Tcl_Interp *interp, Notebook *nb, Tcl_Obj *objPtr, int *index_rtn) { int status = FindTabIndex(interp, nb, objPtr, index_rtn); - if (status == TCL_OK && *index_rtn >= Ttk_NumberSlaves(nb->notebook.mgr)) { + if (status == TCL_OK && *index_rtn >= (int)Ttk_NumberSlaves(nb->notebook.mgr)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "Slave index %s out of bounds", Tcl_GetString(objPtr))); Tcl_SetErrorCode(interp, "TTK", "SLAVE", "INDEX", NULL); @@ -971,7 +971,7 @@ static int NotebookInsertCommand( interp, nb->notebook.mgr, objv[3], &srcIndex) != TCL_OK) { return TCL_ERROR; - } else if (srcIndex >= Ttk_NumberSlaves(nb->notebook.mgr)) { + } else if (srcIndex >= (int)Ttk_NumberSlaves(nb->notebook.mgr)) { srcIndex = Ttk_NumberSlaves(nb->notebook.mgr) - 1; } diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c index 2d494de..91abff0 100644 --- a/generic/ttk/ttkPanedwindow.c +++ b/generic/ttk/ttkPanedwindow.c @@ -701,7 +701,7 @@ static int PanedForgetCommand( interp, pw->paned.mgr, objv[2], &paneIndex)) { return TCL_ERROR; - } else if (paneIndex >= Ttk_NumberSlaves(pw->paned.mgr)) { + } else if (paneIndex >= (int)Ttk_NumberSlaves(pw->paned.mgr)) { paneIndex = Ttk_NumberSlaves(pw->paned.mgr) - 1; } Ttk_ForgetSlave(pw->paned.mgr, paneIndex); @@ -783,7 +783,7 @@ static int PanedPaneCommand( interp,pw->paned.mgr,objv[2],&paneIndex)) { return TCL_ERROR; - } else if (paneIndex >= Ttk_NumberSlaves(pw->paned.mgr)) { + } else if (paneIndex >= (int)Ttk_NumberSlaves(pw->paned.mgr)) { paneIndex = Ttk_NumberSlaves(pw->paned.mgr) - 1; } |