From 65d0c69b1484d6a66a24649cb249b108804ae81b Mon Sep 17 00:00:00 2001
From: Mark Mine <mark.mine@disney.com>
Date: Sat, 9 Feb 2002 02:26:33 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/src/actor/Actor.py                     |  3 ---
 .../src/directdevices/DirectDeviceManager.py  |  2 +-
 direct/src/directtools/DirectSession.py       |  2 +-
 direct/src/extensions/NodePath-extensions.py  | 23 ++++++++-----------
 direct/src/interval/Interval.py               |  3 +--
 direct/src/showbase/PythonUtil.py             |  6 ++---
 6 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py
index e9e7a47f0d..00b845797f 100644
--- a/direct/src/actor/Actor.py
+++ b/direct/src/actor/Actor.py
@@ -908,9 +908,6 @@ class Actor(PandaObject, NodePath):
 
     # actions
     def animPanel(self):
-        base.wantDIRECT = 1
-        base.wantTk = 1
-        from ShowBaseGlobal import *
         import TkGlobal
         import AnimPanel
         return AnimPanel.AnimPanel(self)
diff --git a/direct/src/directdevices/DirectDeviceManager.py b/direct/src/directdevices/DirectDeviceManager.py
index 9bae18095c..4e12b7282d 100644
--- a/direct/src/directdevices/DirectDeviceManager.py
+++ b/direct/src/directdevices/DirectDeviceManager.py
@@ -6,7 +6,7 @@ from PandaModules import *
 ANALOG_MIN = -0.95
 ANALOG_MAX = 0.95
 ANALOG_RANGE = ANALOG_MAX - ANALOG_MIN
-ANALOG_DEADBAND = 0.075
+ANALOG_DEADBAND = 0.125
 
 try:
     myBase = base
diff --git a/direct/src/directtools/DirectSession.py b/direct/src/directtools/DirectSession.py
index 290ab6bdeb..db93bd9bd8 100644
--- a/direct/src/directtools/DirectSession.py
+++ b/direct/src/directtools/DirectSession.py
@@ -165,7 +165,7 @@ class DirectSession(PandaObject):
                             'mouse3', 'mouse3-up']
 
         if base.wantTk:
-            from TkGlobal import tkroot
+            import TkGlobal
             self.panel = DirectSessionPanel(parent = tkroot)
 
         if self.iAmAServer:
diff --git a/direct/src/extensions/NodePath-extensions.py b/direct/src/extensions/NodePath-extensions.py
index a2bb4b3c45..c98c5b4996 100644
--- a/direct/src/extensions/NodePath-extensions.py
+++ b/direct/src/extensions/NodePath-extensions.py
@@ -785,42 +785,37 @@
             return self.__lerp(functorFunc, time, blendType)
             
     def place(self):
-        base.wantDIRECT = 1
         base.wantTk = 1
-        #from ShowBaseGlobal import *
-        #from DirectSession import *
-        import TkGlobal
+        base.wantDIRECT = 1
+        import DirectSession
+        direct.enable()
         import Placer
         return Placer.place(self)
 
     def explore(self):
-        base.wantDIRECT = 1
         base.wantTk = 1
-        #from ShowBaseGlobal import *
+        base.wantDIRECT = 1
         import TkGlobal
         import SceneGraphExplorer
         return SceneGraphExplorer.explore(self)
 
     def rgbPanel(self, cb = None):
-        base.wantDIRECT = 1
         base.wantTk = 1
-        #from ShowBaseGlobal import *
+        base.wantDIRECT = 1
         import TkGlobal
         import EntryScale
         return EntryScale.rgbPanel(self, cb)
 
     def select(self):
-        base.wantDIRECT = 1
         base.wantTk = 1
-        #from ShowBaseGlobal import *
-        import TkGlobal
+        base.wantDIRECT = 1
+        import DirectSession
         direct.select(self)
 
     def deselect(self):
-        base.wantDIRECT = 1
         base.wantTk = 1
-        #from ShowBaseGlobal import *
-        import TkGlobal
+        base.wantDIRECT = 1
+        import DirectSession
         direct.deselect(self)
 
     def setAlphaScale(self, alpha):
diff --git a/direct/src/interval/Interval.py b/direct/src/interval/Interval.py
index 50e7496282..8ddf8086d9 100644
--- a/direct/src/interval/Interval.py
+++ b/direct/src/interval/Interval.py
@@ -169,12 +169,11 @@ class Interval(DirectObject):
         """ popupControls()
             Popup control panel for interval.
         """
-        base.wantTk = 1
         import TkGlobal
         import fpformat
         import string
         # I moved this here because Toontown does not ship Tk
-        from Tkinter import Toplevel, Frame, Button
+        from Tkinter import Toplevel, Frame, Button, LEFT, X
         import Pmw
         import EntryScale
         if tl == None:
diff --git a/direct/src/showbase/PythonUtil.py b/direct/src/showbase/PythonUtil.py
index 8d1c89642c..c9be889d97 100644
--- a/direct/src/showbase/PythonUtil.py
+++ b/direct/src/showbase/PythonUtil.py
@@ -292,21 +292,19 @@ def adjust(command = None, parent = None, **kw):
     10.0
     """
     # Make sure we enable Tk
-    base.wantDIRECT = 1
-    base.wantTk = 1
     import TkGlobal
     import Tkinter
     import EntryScale
     import Pmw
     # Create toplevel if needed
     if not parent:
-        parent = Toplevel()
+        parent = Tkinter.Toplevel()
         parent.title('Parameter Adjust')
     # Set command if specified
     if command:
         kw['command'] = command
     es = apply(EntryScale.EntryScale, (parent,), kw)
-    es.pack(expand = 1, fill = X)
+    es.pack(expand = 1, fill = 'x')
     es.parent = parent
     return es