diff options
| -rw-r--r-- | generic/tkStubLib.c | 15 | ||||
| -rw-r--r-- | generic/tkWindow.c | 4 |
2 files changed, 6 insertions, 13 deletions
diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c index e38d63d..45fc9ef 100644 --- a/generic/tkStubLib.c +++ b/generic/tkStubLib.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkStubLib.c,v 1.22 2008/04/02 03:55:39 dgp Exp $ + * RCS: @(#) $Id: tkStubLib.c,v 1.23 2008/04/02 04:06:38 dgp Exp $ */ /* @@ -20,15 +20,8 @@ * including the rest of the stub functions. */ -#ifndef USE_TCL_STUBS #define USE_TCL_STUBS -#endif -#undef USE_TCL_STUB_PROCS - -#ifndef USE_TK_STUBS #define USE_TK_STUBS -#endif -#undef USE_TK_STUB_PROCS #include "tkInt.h" @@ -81,10 +74,6 @@ static int isDigit(const int c) *---------------------------------------------------------------------- */ -#ifdef Tk_InitStubs -#undef Tk_InitStubs -#endif - CONST char * Tk_InitStubs( Tcl_Interp *interp, @@ -114,6 +103,8 @@ Tk_InitStubs( p++; q++; } if (*p) { + /* Construct error message */ + Tcl_PkgRequireEx(interp, "Tk", version, 1, NULL); return NULL; } } else { diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 9be8885..b021f49 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWindow.c,v 1.91 2008/04/02 03:55:39 dgp Exp $ + * RCS: @(#) $Id: tkWindow.c,v 1.92 2008/04/02 04:06:38 dgp Exp $ */ #include "tkInt.h" @@ -3302,6 +3302,8 @@ Tk_PkgInitStubsCheck( } if (count == 1) { if (0 != strncmp(version, actualVersion, strlen(version))) { + /* Construct error message */ + Tcl_PkgPresent(interp, "Tk", version, 1); return NULL; } } else { |