luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TCL9: Tcl_InitStubs(version="9.0")

This commit is contained in:
Darryl L. Miles 2024-10-21 09:19:15 +01:00 committed by Tim Edwards
parent 77a7afc8e2
commit 661b66a143
10 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext2sim/ext2sim.c
View File

@ -210,7 +210,7 @@ Exttosim_Init(interp)
if (interp == NULL) return TCL_ERROR;
if (Tcl_PkgRequire(interp, "Tclmagic", MAGIC_VERSION, 0) == NULL)
return TCL_ERROR;
if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
if (Tcl_InitStubs(interp, Tclmagic_InitStubsVersion, 0) == NULL) return TCL_ERROR;
TxPrintf("Auto-loading EXTTOSIM module\n");
TxFlushOut();

2
ext2spice/ext2spice.c
View File

@ -208,7 +208,7 @@ Exttospice_Init(interp)
if (interp == NULL) return TCL_ERROR;
if (Tcl_PkgRequire(interp, "Tclmagic", MAGIC_VERSION, 0) == NULL)
return TCL_ERROR;
if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
if (Tcl_InitStubs(interp, Tclmagic_InitStubsVersion, 0) == NULL) return TCL_ERROR;
TxPrintf("Auto-loading EXTTOSPICE module\n");
TxFlushOut();

2
graphics/grTCairo1.c
View File

@ -261,7 +261,7 @@ GrTCairoInit ()
{
bool rstatus;
if (Tk_InitStubs(magicinterp, "8.5", 0) == NULL) return FALSE;
if (Tk_InitStubs(magicinterp, Tclmagic_InitStubsVersion, 0) == NULL) return FALSE;
tcairoCurrent.window = Tk_MainWindow(magicinterp);
if (tcairoCurrent.window == NULL)

2
graphics/grTOGL1.c
View File

@ -269,7 +269,7 @@ GrTOGLInit ()
static int attributeList[] = { GLX_RGBA, None, None };
#endif
if (Tk_InitStubs(magicinterp, "8.5", 0) == NULL) return FALSE;
if (Tk_InitStubs(magicinterp, Tclmagic_InitStubsVersion, 0) == NULL) return FALSE;
toglCurrent.window = Tk_MainWindow(magicinterp);
if (toglCurrent.window == NULL)

2
graphics/grTk1.c
View File

@ -372,7 +372,7 @@ GrTkInit(dispType)
int color_base, color_reserved;
int status;
if (Tk_InitStubs(magicinterp, "8.5", 0) == NULL) return FALSE;
if (Tk_InitStubs(magicinterp, Tclmagic_InitStubsVersion, 0) == NULL) return FALSE;
grCurrent.window = Tk_MainWindow(magicinterp);

2
lef/tcllef.c
View File

@ -42,7 +42,7 @@ Magiclef_Init(interp)
if (interp == NULL) return TCL_ERROR;
if (Tcl_PkgRequire(interp, "Tclmagic", MAGIC_VERSION, 0) == NULL)
return TCL_ERROR;
if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
if (Tcl_InitStubs(interp, Tclmagic_InitStubsVersion, 0) == NULL) return TCL_ERROR;
TxPrintf("Auto-loading LEF/DEF module\n");
TxFlushOut();

2
plot/tclplot.c
View File

@ -46,7 +46,7 @@ Tclplot_Init(interp)
if (interp == NULL) return TCL_ERROR;
if (Tcl_PkgRequire(interp, "Tclmagic", MAGIC_VERSION, 0) == NULL)
return TCL_ERROR;
if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
if (Tcl_InitStubs(interp, Tclmagic_InitStubsVersion, 0) == NULL) return TCL_ERROR;
TxPrintf("Auto-loading PLOT module\n");
TxFlushOut();

2
router/tclroute.c
View File

@ -53,7 +53,7 @@ Tclroute_Init(interp)
if (interp == NULL) return TCL_ERROR;
if (Tcl_PkgRequire(interp, "Tclmagic", MAGIC_VERSION, 0) == NULL)
return TCL_ERROR;
if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
if (Tcl_InitStubs(interp, Tclmagic_InitStubsVersion, 0) == NULL) return TCL_ERROR;
TxPrintf("Auto-loading ROUTE module\n");
TxFlushOut();

12
tcltk/tclmagic.c
View File

@ -53,6 +53,16 @@ char *MagicVersion = MAGIC_VERSION;
char *MagicRevision = MAGIC_REVISION;
char *MagicCompileTime = MAGIC_DATE;
#if TCL_MAJOR_VERSION < 9
const char *Tclmagic_InitStubsVersion = "8.5";
#else
/* Major version changed API (as you'd expect for a major version upgrade)
* which is compiled into the resulting binary.
* No possibility of dual version support.
*/
const char *Tclmagic_InitStubsVersion = "9.0";
#endif
Tcl_Interp *magicinterp;
Tcl_Interp *consoleinterp;
@ -1293,7 +1303,7 @@ Tclmagic_Init(interp)
/* Remember the interpreter */
magicinterp = interp;
if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
if (Tcl_InitStubs(interp, Tclmagic_InitStubsVersion, 0) == NULL) return TCL_ERROR;
/* Initialization and Startup commands */
Tcl_CreateCommand(interp, "magic::initialize", (Tcl_CmdProc *)_magic_initialize,

2
tcltk/tclmagic.h
View File

@ -28,5 +28,7 @@ extern int TagVerify();
extern int Tcl_printf();
extern void MakeWindowCommand();
extern const char *Tclmagic_InitStubsVersion;
#endif /* MAGIC_WRAPPER */
#endif /* _TCLMAGIC_H */