diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-11-03 16:23:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-11-03 16:23:24 (GMT) |
| commit | bf6376a2e045cc8245b54c5ea9ef563c3cfb3bf4 (patch) | |
| tree | b3f6843fc8a7d2b7021c490eea1dd6e4b319cd02 | |
| parent | 95dbb93bae43e8f652c32783dcb9908791c05c1e (diff) | |
| download | tk-bf6376a2e045cc8245b54c5ea9ef563c3cfb3bf4.zip tk-bf6376a2e045cc8245b54c5ea9ef563c3cfb3bf4.tar.gz tk-bf6376a2e045cc8245b54c5ea9ef563c3cfb3bf4.tar.bz2 | |
Deprecate Tk_MainEx() stub entry (TIP #512). Only has effect if compiled with TK_NO_DEPRECATED=1
| -rw-r--r-- | generic/tk.decls | 2 | ||||
| -rw-r--r-- | generic/tkDecls.h | 2 | ||||
| -rw-r--r-- | generic/tkWindow.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/generic/tk.decls b/generic/tk.decls index 16de241..9619416 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -805,7 +805,7 @@ declare 211 { int Tk_InitOptions(Tcl_Interp *interp, void *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin) } -declare 212 { +declare 212 {nostub {Don't use this function in a stub-enabled extension}} { void Tk_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp) } diff --git a/generic/tkDecls.h b/generic/tkDecls.h index eb3af95..0d52f2f 100644 --- a/generic/tkDecls.h +++ b/generic/tkDecls.h @@ -1102,7 +1102,7 @@ typedef struct TkStubs { int (*tk_GetReliefFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr); /* 209 */ int (*tk_GetScrollInfoObj) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], double *dblPtr, int *intPtr); /* 210 */ int (*tk_InitOptions) (Tcl_Interp *interp, void *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 211 */ - void (*tk_MainEx) (int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); /* 212 */ + TCL_DEPRECATED_API("Don't use this function in a stub-enabled extension") void (*tk_MainEx) (int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); /* 212 */ void (*tk_RestoreSavedOptions) (Tk_SavedOptions *savePtr); /* 213 */ int (*tk_SetOptions) (Tcl_Interp *interp, void *recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *const objv[], Tk_Window tkwin, Tk_SavedOptions *savePtr, int *maskPtr); /* 214 */ void (*tk_InitConsoleChannels) (Tcl_Interp *interp); /* 215 */ diff --git a/generic/tkWindow.c b/generic/tkWindow.c index d36313b..198c2d7 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -2834,7 +2834,7 @@ static HMODULE tkcygwindll = NULL; /* * Run Tk_MainEx from libtk8.?.dll * - * This function is only ever called from wish8.4.exe, the cygwin port of Tcl. + * This function is only ever called from wish8.?.exe, the cygwin port of Tcl. * This means that the system encoding is utf-8, so we don't have to do any * encoding conversions. */ @@ -2850,7 +2850,7 @@ TkCygwinMainEx( Tcl_Interp *interp) { TCHAR name[MAX_PATH]; - int len; + size_t len; void (*tkmainex)(int, char **, Tcl_AppInitProc *, Tcl_Interp *); /* construct "<path>/libtk8.?.dll", from "<path>/tk8?.dll" */ |