diff options
| author | lfb <lfb> | 1999-03-09 01:56:01 (GMT) |
|---|---|---|
| committer | lfb <lfb> | 1999-03-09 01:56:01 (GMT) |
| commit | b20325f59cefae248e9e8f156cd1e6b8e194c3cc (patch) | |
| tree | f0e466d531857d2d545456cb681f554d6f69efe1 | |
| parent | cbfe3cb5d48a1326ac84fcf2586c7c3760b64d17 (diff) | |
| download | tk-b20325f59cefae248e9e8f156cd1e6b8e194c3cc.zip tk-b20325f59cefae248e9e8f156cd1e6b8e194c3cc.tar.gz tk-b20325f59cefae248e9e8f156cd1e6b8e194c3cc.tar.bz2 | |
Added shameful hack for dealing with Tk_Uids in a thread-specific way
until they can be removed from the world, like the parasites they are...
| -rw-r--r-- | generic/tkOldConfig.c | 8 | ||||
| -rw-r--r-- | generic/tkTest.c | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c index 1b2ed20..3a9a23e 100644 --- a/generic/tkOldConfig.c +++ b/generic/tkOldConfig.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: tkOldConfig.c,v 1.1.2.4 1999/02/16 11:39:31 lfb Exp $ + * RCS: @(#) $Id: tkOldConfig.c,v 1.1.2.5 1999/03/09 01:56:01 lfb Exp $ */ #include "tkPort.h" @@ -184,7 +184,11 @@ Tk_ConfigureWidget(interp, tkwin, specs, argc, argv, widgRec, flags) return TCL_ERROR; } } else { - value = specPtr->defValue; + if (specPtr->defValue != NULL) { + value = Tk_GetUid(specPtr->defValue); + } else { + value = NULL; + } if ((value != NULL) && !(specPtr->specFlags & TK_CONFIG_DONT_SET_DEFAULT)) { if (DoConfig(interp, tkwin, specPtr, value, 1, widgRec) != diff --git a/generic/tkTest.c b/generic/tkTest.c index e1cf611..009a44b 100644 --- a/generic/tkTest.c +++ b/generic/tkTest.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTest.c,v 1.1.4.3 1999/02/11 04:13:47 stanton Exp $ + * RCS: @(#) $Id: tkTest.c,v 1.1.4.4 1999/03/09 01:56:01 lfb Exp $ */ #include "tkInt.h" @@ -204,6 +204,8 @@ static void TrivialEventProc _ANSI_ARGS_((ClientData clientData, extern int TkplatformtestInit _ANSI_ARGS_(( Tcl_Interp *interp)); +extern int TclThread_Init _ANSI_ARGS_((Tcl_Interp *interp)); + #if !(defined(__WIN32__) || defined(MAC_TCL)) #define TkplatformtestInit(x) TCL_OK #endif @@ -279,7 +281,13 @@ Tktest_Init(interp) (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); #endif -/* +#ifdef TCL_THREADS + if (TclThread_Init(interp) != TCL_OK) { + return TCL_ERROR; + } +#endif + + /* * Create test image type. */ |