From ac3ba58e557dedd63e241057c1eb97b1f1f64390 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 23 Jul 2013 17:54:30 +0000
Subject: [PATCH] Move all tk/tcl stuff to the 'tk' package, fix tcl file
 location

---
 direct/src/p3d/panda3d.pdef    |  6 +++---
 direct/src/p3d/thirdparty.pdef | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/direct/src/p3d/panda3d.pdef b/direct/src/p3d/panda3d.pdef
index a5ecb9cfd0..668dadab08 100755
--- a/direct/src/p3d/panda3d.pdef
+++ b/direct/src/p3d/panda3d.pdef
@@ -162,9 +162,9 @@ class morepy(package):
            'DocXMLRPCServer', 'audioop', 'imageop', 'aifc', 'sunau',
            'wave', 'chunk', 'colorsys', 'imghdr', 'sndhdr',
            'ossaudiodev', 'gettext', 'locale', 'cmd', 'shlex',
-           'Tkinter', 'Tix', 'ScrolledText', 'turtle', 'pydoc',
-           'doctest', 'unittest', 'test', 'test.test_support', 'bdb',
-           'pdb', 'hotshot', 'timeit', 'trace', 'sys', '__builtin__')
+           'pydoc', 'doctest', 'unittest', 'test',
+           'test.test_support', 'bdb', 'pdb', 'hotshot', 'timeit',
+           'trace', 'sys', '__builtin__')
     module('future_builtins', 'warnings', 'contextlib', 'abc',
            'atexit', 'traceback', '__future__', 'gc', 'inspect',
            'site', 'user', 'fpectl', 'code', 'codeop', 'rexec',
diff --git a/direct/src/p3d/thirdparty.pdef b/direct/src/p3d/thirdparty.pdef
index b580c49225..d272c805a0 100644
--- a/direct/src/p3d/thirdparty.pdef
+++ b/direct/src/p3d/thirdparty.pdef
@@ -33,17 +33,20 @@ class tk(package):
     require('panda3d')
 
     module('Tkinter', '_tkinter', required = True)
-    module('Tkconstants', 'Tkdnd', 'tkColorChooser',
-           'tkCommonDialog', 'tkFileDialog', 'tkFont',
-           'tkMessageBox', 'tkSimpleDialog')
+    module('Tkconstants', 'Tkdnd', 'Tix', 'ScrolledText', 'turtle',
+           'tkColorChooser', 'tkCommonDialog', 'tkFileDialog',
+           'tkFont', 'tkMessageBox', 'tkSimpleDialog')
     module('direct.showbase.TkGlobal',
            'direct.tkpanels',
            'direct.tkwidgets')
 
     try:
         from Tkinter import Tcl
-        dir = Filename.fromOsSpecific(Tcl().eval("info library"))
-        file(Filename(dir, "*.tcl"), extract = True)
+        tcl = Tcl()
+        dir = Filename.fromOsSpecific(tcl.eval("info library"))
+        ver = tcl.eval("info tclversion")
+
+        file(Filename(dir, "*.tcl"), newDir = 'lib/tcl' + ver, extract = True)
     except ImportError:
         pass