summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2008-04-02 04:05:12 (GMT)
committerdgp <dgp@users.sourceforge.net>2008-04-02 04:05:12 (GMT)
commit1eda27deee46a478db284dd6c7c96135ff504b34 (patch)
treee0d734866e9d0f759f3f95651818e48f9b4e9279 /generic
parentf73ea7cad40f810a82d7253883f2333c1b3b6515 (diff)
downloadtk-1eda27deee46a478db284dd6c7c96135ff504b34.zip
tk-1eda27deee46a478db284dd6c7c96135ff504b34.tar.gz
tk-1eda27deee46a478db284dd6c7c96135ff504b34.tar.bz2
* generic/tkStubLib.c (Tcl_InitStubs): Added missing error message.
* generic/tkWindow.c (Tk_PkgInitStubsCheck):
Diffstat (limited to 'generic')
-rw-r--r--generic/tkStubLib.c5
-rw-r--r--generic/tkWindow.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c
index fbf1ed1..3841bcf 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.20 2008/03/19 17:31:35 das Exp $
+ * RCS: @(#) $Id: tkStubLib.c,v 1.20.2.1 2008/04/02 04:05:13 dgp Exp $
*/
/*
@@ -114,7 +114,10 @@ Tk_InitStubs(
p++; q++;
}
if (*p) {
+ /* Construct error message */
+ Tcl_PkgRequireEx(interp, "Tk", version, 1, NULL);
return NULL;
+
}
} else {
actualVersion = Tcl_PkgRequireEx(interp, "Tk", version, 1, NULL);
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 0c5e3e9..326f812 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.89 2007/12/13 15:24:21 dgp Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.89.2.1 2008/04/02 04:05:13 dgp Exp $
*/
#include "tkInt.h"
@@ -3308,6 +3308,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 {