diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-12-01 21:59:50 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-12-01 21:59:50 (GMT) |
| commit | 8b0a53ab15d95c2d590c9d48af6190be2b66f1cc (patch) | |
| tree | 5f3392cdcb61641b4ff591005acced412946b3b0 /macosx/tkMacOSXImage.c | |
| parent | 79b75351df9082d79419aebf7154168f97186d56 (diff) | |
| download | tk-8b0a53ab15d95c2d590c9d48af6190be2b66f1cc.zip tk-8b0a53ab15d95c2d590c9d48af6190be2b66f1cc.tar.gz tk-8b0a53ab15d95c2d590c9d48af6190be2b66f1cc.tar.bz2 | |
More "const" and (C++-compatible) type-casts. Also put (back) an osversion check
Diffstat (limited to 'macosx/tkMacOSXImage.c')
| -rw-r--r-- | macosx/tkMacOSXImage.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c index ad317b1..20abdcd 100644 --- a/macosx/tkMacOSXImage.c +++ b/macosx/tkMacOSXImage.c @@ -1210,6 +1210,7 @@ TkNSImageConfigureMaster( Tcl_Obj *objPtr; static Tcl_Obj *asOption = NULL; int sourceInterpretation; + NSString *source; if (asOption == NULL) { asOption = Tcl_NewStringObj("-as", -1); @@ -1238,7 +1239,7 @@ TkNSImageConfigureMaster( goto errorExit; } - NSString *source = [[NSString alloc] initWithUTF8String: masterPtr->source]; + source = [[NSString alloc] initWithUTF8String: masterPtr->source]; switch (sourceInterpretation) { case NAME_SOURCE: newImage = [[NSImage imageNamed:source] copy]; @@ -1331,7 +1332,7 @@ TkNSImageObjCmd( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { - TkNSImageMaster *masterPtr = clientData; + TkNSImageMaster *masterPtr = (TkNSImageMaster *)clientData; Tk_OptionTable optionTable = Tk_CreateOptionTable(interp, systemImageOptions); static const char *const options[] = {"cget", "configure", NULL}; enum {CGET, CONFIGURE}; @@ -1424,10 +1425,10 @@ TkNSImageCreate( TkNSImageMaster *masterPtr; Tk_OptionTable optionTable = Tk_CreateOptionTable(interp, systemImageOptions); - masterPtr = ckalloc(sizeof(TkNSImageMaster)); + masterPtr = (TkNSImageMaster *)ckalloc(sizeof(TkNSImageMaster)); masterPtr->tkMaster = master; masterPtr->interp = interp; - masterPtr->imageName = ckalloc(strlen(name) + 1); + masterPtr->imageName = (char *)ckalloc(strlen(name) + 1); strcpy(masterPtr->imageName, name); masterPtr->flags = 0; masterPtr->instancePtr = NULL; @@ -1477,7 +1478,7 @@ TkNSImageGet( TkNSImageMaster *masterPtr = (TkNSImageMaster *) clientData; TkNSImageInstance *instPtr; - instPtr = ckalloc(sizeof(TkNSImageInstance)); + instPtr = (TkNSImageInstance *)ckalloc(sizeof(TkNSImageInstance)); instPtr->masterPtr = masterPtr; return instPtr; } |