diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-31 19:54:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-31 19:54:49 (GMT) |
| commit | 8d2dbe96066152901e507e44cf7dec9b00f2bee3 (patch) | |
| tree | 27cd4550429711dfdbcc60e83e12d01c5f4b9b03 /generic/tkMenuDraw.c | |
| parent | c46f74289a79498f91f6bd70d409449bc6f00b41 (diff) | |
| download | tk-8d2dbe96066152901e507e44cf7dec9b00f2bee3.zip tk-8d2dbe96066152901e507e44cf7dec9b00f2bee3.tar.gz tk-8d2dbe96066152901e507e44cf7dec9b00f2bee3.tar.bz2 | |
Change (internal) signature of TkMenuConfigureEntryDrawOptions/TkActivateMenuEntry such that - if compiled with Tcl 9.0 headers - indexes > 2G can be used.
Also, change a lot of Tcl_NewIntObj()/Tcl_NewBooleanObj() calls to Tcl_NewWideIntObj().
Diffstat (limited to 'generic/tkMenuDraw.c')
| -rw-r--r-- | generic/tkMenuDraw.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/generic/tkMenuDraw.c b/generic/tkMenuDraw.c index bd00d38..e3a1ef6 100644 --- a/generic/tkMenuDraw.c +++ b/generic/tkMenuDraw.c @@ -298,7 +298,7 @@ TkMenuConfigureDrawOptions( int TkMenuConfigureEntryDrawOptions( TkMenuEntry *mePtr, - int index) + TkSizeT index) { XGCValues gcValues; GC newGC, newActiveGC, newDisabledGC, newIndicatorGC; @@ -487,7 +487,7 @@ TkEventuallyRedrawMenu( register TkMenuEntry *mePtr)/* Entry to redraw. NULL means redraw all the * entries in the menu. */ { - int i; + TkSizeT i; if (menuPtr->tkwin == NULL) { return; @@ -618,7 +618,8 @@ DisplayMenu( register TkMenu *menuPtr = clientData; register TkMenuEntry *mePtr; register Tk_Window tkwin = menuPtr->tkwin; - int index, strictMotif; + TkSizeT index; + int strictMotif; Tk_Font tkfont; Tk_FontMetrics menuMetrics; int width; @@ -911,8 +912,8 @@ TkPostSubmenu( menuPtr->postedCascade = mePtr; subary[0] = mePtr->namePtr; subary[1] = Tcl_NewStringObj("post", -1); - subary[2] = Tcl_NewIntObj(x); - subary[3] = Tcl_NewIntObj(y); + subary[2] = Tcl_NewWideIntObj(x); + subary[3] = Tcl_NewWideIntObj(y); Tcl_IncrRefCount(subary[1]); Tcl_IncrRefCount(subary[2]); Tcl_IncrRefCount(subary[3]); |