diff options
| author | jenglish <jenglish@flightlab.com> | 2008-10-24 20:01:10 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2008-10-24 20:01:10 (GMT) |
| commit | 1f5835f567b76c544877c30f2eb28456a0db5643 (patch) | |
| tree | 9aa9f152bc350013e608a7af9efb74daef1486d5 /generic | |
| parent | 3f73a2af199d6d4f755b7529b57c831a8624e7e4 (diff) | |
| download | tk-1f5835f567b76c544877c30f2eb28456a0db5643.zip tk-1f5835f567b76c544877c30f2eb28456a0db5643.tar.gz tk-1f5835f567b76c544877c30f2eb28456a0db5643.tar.bz2 | |
Disable test ttk-6.3, it's not applicable [Bug 2175411].
Use different Tcl_AssocData key for Ttk so the tile extension
can be loaded into an 8.6 interp, in the off-chance that anyone
wants to do this.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/ttk/ttkTheme.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c index 33e6aab..91805d6 100644 --- a/generic/ttk/ttkTheme.c +++ b/generic/ttk/ttkTheme.c @@ -9,20 +9,16 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * $Id: ttkTheme.c,v 1.15 2008/07/23 23:24:45 nijtmans Exp $ + * $Id: ttkTheme.c,v 1.16 2008/10/24 20:01:10 jenglish Exp $ */ #include <stdlib.h> #include <string.h> #include <tk.h> +#include <tkInt.h> #include "ttkThemeInt.h" -#ifdef NO_PRIVATE_HEADERS -EXTERN const Tk_OptionSpec *TkGetOptionSpec(const char *name, - Tk_OptionTable optionTable); -#else -#include <tkInt.h> -#endif +#define PKG_ASSOC_KEY "Ttk" /*------------------------------------------------------------------------ * +++ Styles. @@ -475,7 +471,7 @@ static void Ttk_StylePkgFree(ClientData clientData, Tcl_Interp *interp) static StylePackageData *GetStylePackageData(Tcl_Interp *interp) { - return (StylePackageData*)Tcl_GetAssocData(interp, "StylePackage", NULL); + return Tcl_GetAssocData(interp, PKG_ASSOC_KEY, NULL); } /* @@ -1708,8 +1704,7 @@ void Ttk_StylePkgInit(Tcl_Interp *interp) pkgPtr->cache = Ttk_CreateResourceCache(interp); pkgPtr->themeChangePending = 0; - Tcl_SetAssocData(interp, "StylePackage", Ttk_StylePkgFree, - (ClientData)pkgPtr); + Tcl_SetAssocData(interp, PKG_ASSOC_KEY, Ttk_StylePkgFree, pkgPtr); /* * Create the default system theme: |