diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-10 10:07:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-10 10:07:19 (GMT) |
| commit | ef50c3a8b950562b14a7fd5677492c3deaf1bf8f (patch) | |
| tree | 7e3ba7422180dab95eadaa951af2978df714c3c6 /generic/tkBusy.c | |
| parent | 65b61144b87cb08978118bcc11ddbf96768c02f4 (diff) | |
| parent | 7b3b30d439640b2474a81ff1b97c8ae264811165 (diff) | |
| download | tk-ef50c3a8b950562b14a7fd5677492c3deaf1bf8f.zip tk-ef50c3a8b950562b14a7fd5677492c3deaf1bf8f.tar.gz tk-ef50c3a8b950562b14a7fd5677492c3deaf1bf8f.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkBusy.c')
| -rw-r--r-- | generic/tkBusy.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tkBusy.c b/generic/tkBusy.c index 97fa13d..4dee047 100644 --- a/generic/tkBusy.c +++ b/generic/tkBusy.c @@ -519,7 +519,8 @@ CreateBusy( Tk_Window tkRef) /* Window hosting the busy window */ { Busy *busyPtr; - int length, x, y; + size_t length; + int x, y; const char *fmt; char *name; Tk_Window tkBusy, tkChild, tkParent; @@ -568,7 +569,7 @@ CreateBusy( busyPtr->height = Tk_Height(tkRef); busyPtr->x = Tk_X(tkRef); busyPtr->y = Tk_Y(tkRef); - busyPtr->cursor = None; + busyPtr->cursor = NULL; Tk_SetClass(tkBusy, "Busy"); busyPtr->optionTable = Tk_CreateOptionTable(interp, busyOptionSpecs); if (Tk_InitOptions(interp, busyPtr, busyPtr->optionTable, @@ -598,7 +599,7 @@ CreateBusy( */ Tk_ManageGeometry(tkBusy, &busyMgrInfo, busyPtr); - if (busyPtr->cursor != None) { + if (busyPtr->cursor != NULL) { Tk_DefineCursor(tkBusy, busyPtr->cursor); } @@ -643,7 +644,7 @@ ConfigureBusy( return TCL_ERROR; } if (busyPtr->cursor != oldCursor) { - if (busyPtr->cursor == None) { + if (busyPtr->cursor == NULL) { Tk_UndefineCursor(busyPtr->tkBusy); } else { Tk_DefineCursor(busyPtr->tkBusy, busyPtr->cursor); |