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.

3 files changed, 15 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 79c3f9d..034b873 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-24  Joe English  <jenglish@users.sourceforge.net>
+
+	* tests/ttk/ttk.test: Disable test ttk-6.3, it's not 
+	applicable [Bug 2175411].
+
+	* generic/ttk/ttkTheme.c: Use different Tcl_AssocData key
+	so the tile extension can be loaded into an 8.6 interp,
+	in the off-chance that anyone wants to do this.
+
 2008-10-24  Donal K. Fellows  <dkf@users.sf.net>
 
 	* generic/tkCanvUtil.c (TkSmoothPrintProc): Corrected 'const'ness to
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:
diff --git a/tests/ttk/ttk.test b/tests/ttk/ttk.test
index 315aea2..4092c40 100644
--- a/tests/ttk/ttk.test
+++ b/tests/ttk/ttk.test
@@ -28,12 +28,7 @@ test ttk-6.2 "Checkbutton self-destructed" -body {
     winfo exists .sd
 } -result 0
 
-test ttk-6.3 "Test package cleanup" -body {
-    interp create foo
-    foo eval { if {[catch {package require Tk}]} { load {} Tk } }
-    foo eval { destroy . }
-    interp delete foo
-}
+# test ttk-6.3 not applicable [see #2175411]
 
 test ttk-6.4 "Defeat evil intentions" -body {
     trace variable OUCH r { kill.b }