diff --git a/VERSION b/VERSION index 996636a1..ac7ca02c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.3.666 +8.3.667 diff --git a/cif/CIFhier.c b/cif/CIFhier.c index d0b6c73b..e985485d 100644 --- a/cif/CIFhier.c +++ b/cif/CIFhier.c @@ -722,6 +722,7 @@ CIFGenSubcells( bool longTime = FALSE; #ifdef MAGIC_WRAPPER +#ifndef MAGIC_NO_TK /* This routine may be long-running and events to refresh the * console will be periodically run to allow the progress status * to be displayed. Force a restriction on event processing to @@ -733,6 +734,7 @@ CIFGenSubcells( if (SigInterruptOnSigIO != -1) /* Check for batch mode */ oldProc = Tk_RestrictEvents(RestrictInputProc, (ClientData)NULL, &oldArg); +#endif /* MAGIC_NO_TK */ #endif /* MAGIC_WRAPPER */ UndoDisable(); @@ -884,9 +886,11 @@ CIFGenSubcells( if (longTime) TxPrintf("Completed 100%%\n"); #ifdef MAGIC_WRAPPER +#ifndef MAGIC_NO_TK /* Restore full event access */ if (SigInterruptOnSigIO != -1) /* Check for batch mode */ Tk_RestrictEvents(oldProc, oldArg, &oldArg); +#endif /* MAGIC_NO_TK */ #endif /* MAGIC_WRAPPER */ UndoEnable(); diff --git a/extract/ExtSubtree.c b/extract/ExtSubtree.c index 9d9ccb69..19e1109c 100644 --- a/extract/ExtSubtree.c +++ b/extract/ExtSubtree.c @@ -180,6 +180,7 @@ extSubtree(parentUse, reg, f) bool longTime = FALSE; #ifdef MAGIC_WRAPPER +#ifndef MAGIC_NO_TK /* This routine may be long-running and events to refresh the * console will be periodically run to allow the progress status * to be displayed. Force a restriction on event processing to @@ -191,6 +192,7 @@ extSubtree(parentUse, reg, f) if (SigInterruptOnSigIO != -1) /* Check for batch mode */ oldProc = Tk_RestrictEvents(RestrictInputProc, (ClientData)NULL, &oldArg); +#endif /* MAGIC_NO_TK */ #endif /* MAGIC_WRAPPER */ /* Use the display timer to force a 5-second progress check */ @@ -385,9 +387,11 @@ done: } #ifdef MAGIC_WRAPPER +#ifndef MAGIC_NO_TK /* Restore full event access */ if (SigInterruptOnSigIO != -1) /* Check for batch mode */ Tk_RestrictEvents(oldProc, oldArg, &oldArg); +#endif /* MAGIC_NO_TK */ #endif /* MAGIC_WRAPPER */ } diff --git a/lef/defRead.c b/lef/defRead.c index 850048af..e9fcba79 100644 --- a/lef/defRead.c +++ b/lef/defRead.c @@ -2500,8 +2500,10 @@ DefRead( }; #ifdef MAGIC_WRAPPER +#ifndef MAGIC_NO_TK Tk_RestrictProc *oldProc; ClientData oldArg; +#endif /* MAGIC_NO_TK */ #endif /* MAGIC_WRAPPER */ /* "annotate" implies "dolabels" whether set or not */ @@ -2526,6 +2528,7 @@ DefRead( } #ifdef MAGIC_WRAPPER +#ifndef MAGIC_NO_TK /* This routine may be long-running and events to refresh the * console will be periodically run to allow the progress status * to be displayed. Force a restriction on event processing to @@ -2535,6 +2538,7 @@ DefRead( if (SigInterruptOnSigIO != -1) /* Check for batch mode */ oldProc = Tk_RestrictEvents(RestrictInputProc, (ClientData)NULL, &oldArg); +#endif /* MAGIC_NO_TK */ #endif /* MAGIC_WRAPPER */ /* Initialize */ @@ -2759,9 +2763,11 @@ DefRead( UndoEnable(); #ifdef MAGIC_WRAPPER +#ifndef MAGIC_NO_TK /* Restore full event access */ if (SigInterruptOnSigIO != -1) /* Check for batch mode */ Tk_RestrictEvents(oldProc, oldArg, &oldArg); +#endif /* MAGIC_NO_TK */ #endif /* MAGIC_WRAPPER */ return rootDef; diff --git a/tcltk/tclmagic.h b/tcltk/tclmagic.h index 8057026f..ea1f9583 100644 --- a/tcltk/tclmagic.h +++ b/tcltk/tclmagic.h @@ -34,8 +34,9 @@ extern const char *Tclmagic_InitStubsVersion; extern void TclmagicRegisterCommands(Tcl_Interp *interp); +#ifndef MAGIC_NO_TK extern Tk_RestrictAction RestrictInputProc(ClientData, XEvent *); - +#endif #endif /* MAGIC_WRAPPER */ #endif /* _MAGIC__TCLTK__TCLMAGIC_H */