Fixes for __all__

direct/src/tkpanels/AnimPanel.py

@@ -6,9 +6,8 @@
 from direct.tkwidgets.AppShell import *
 from direct.showbase.TkGlobal import *
 from tkSimpleDialog import askfloat
-import string
+from Tkinter import *
-import math
+import Pmw, string, math, types
-import types
 from direct.task import Task
 
 FRAMES = 0

direct/src/tkpanels/DirectSessionPanel.py

@@ -3,9 +3,9 @@
 # Import Tkinter, Pmw, and the dial code
 from direct.showbase.TkGlobal import *
 from direct.tkwidgets.AppShell import *
+from Tkinter import *
 from pandac.PandaModules import *
-
+import Pmw, string
-import string
 from direct.tkwidgets import Dial
 from direct.tkwidgets import Floater
 from direct.tkwidgets import Slider

direct/src/tkpanels/FSMInspector.py

@@ -2,8 +2,8 @@
 from direct.tkwidgets.AppShell import *
 from direct.showbase.TkGlobal import *
 from tkSimpleDialog import askstring
-import math
+from Tkinter import *
-import operator
+import Pmw, math, operator
 
 DELTA = (5.0 / 360.) * 2.0 * math.pi
 

direct/src/tkpanels/Inspector.py

@@ -5,6 +5,8 @@
 
 import string
 from direct.showbase.TkGlobal import *
+from Tkinter import *
+import Pmw
 
 ### public API
 

direct/src/tkpanels/MopathRecorder.py

@@ -10,8 +10,8 @@ from direct.directtools.DirectUtil import *
 from direct.directtools.DirectGeometry import *
 from direct.directtools.DirectSelection import *
 from tkFileDialog import *
-import os
+from Tkinter import *
-import string
+import Pmw, os, string
 from direct.tkwidgets import Dial
 from direct.tkwidgets import Floater
 from direct.tkwidgets import Slider

direct/src/tkpanels/ParticlePanel.py

@@ -12,7 +12,8 @@ from direct.tkwidgets import VectorWidgets
 from direct.particles import ForceGroup
 from direct.particles import Particles
 from direct.particles import ParticleEffect
-import os,Placer
+from Tkinter import *
+import Pmw, os,Placer
 
 from pandac.PandaModules import *
 

direct/src/tkpanels/Placer.py

@@ -7,6 +7,8 @@ from direct.tkwidgets.AppShell import *
 from direct.tkwidgets import Dial
 from direct.tkwidgets import Floater
 from direct.directtools.DirectGlobals import ZERO_VEC, UNIT_VEC
+from Tkinter import *
+import Pmw
 
 """
 TODO:

direct/src/tkpanels/TaskManagerPanel.py

@@ -1,4 +1,6 @@
 from direct.tkwidgets.AppShell import *
+from Tkinter import *
+import Pmw
 
 class TaskManagerPanel(AppShell):
     # Override class variables here

direct/src/tkwidgets/AppShell.py

@@ -7,6 +7,8 @@ created by Doug Hellmann (doughellmann@mindspring.com).
 from direct.showbase.DirectObject import DirectObject
 from direct.showbase.TkGlobal import *
 from tkFileDialog import *
+from Tkinter import *
+import Pmw
 import Dial
 import Floater
 import Slider

direct/src/tkwidgets/Dial.py

@@ -3,11 +3,10 @@ Dial Class: Velocity style controller for floating point values with
              a label, entry (validated), and scale
 """
 from direct.showbase.TkGlobal import *
+from Tkinter import *
 from Valuator import *
 from direct.task import Task
-import math
+import math, string, operator, Pmw
-import string
-import operator
 from pandac.PandaModules import ClockObject
 
 TWO_PI = 2.0 * math.pi

direct/src/tkwidgets/EntryScale.py

@@ -3,7 +3,8 @@ EntryScale Class: Scale with a label, and a linked and validated entry
 """
 from direct.showbase.DirectObject import DirectObject
 from direct.showbase.TkGlobal import *
-import string
+from Tkinter import *
+import string, Pmw
 import tkColorChooser
 from tkSimpleDialog import *
 

direct/src/tkwidgets/Floater.py

@@ -3,9 +3,10 @@ Floater Class: Velocity style controller for floating point values with
                 a label, entry (validated), and scale
 """
 from direct.showbase.TkGlobal import *
+from Tkinter import *
 from Valuator import *
 from direct.task import Task
-import math, sys, string
+import math, sys, string, Pmw
 
 FLOATER_WIDTH = 22
 FLOATER_HEIGHT = 18

direct/src/tkwidgets/ProgressBar.py

@@ -2,6 +2,7 @@
 A  basic widget for showing the progress being made in a task.
 """
 from direct.showbase.TkGlobal import *
+from Tkinter import *
 
 class ProgressBar:
     def __init__(self, master=None, orientation="horizontal",

direct/src/tkwidgets/SceneGraphExplorer.py

@@ -1,5 +1,6 @@
 from direct.showbase.DirectObject import DirectObject
 from direct.showbase.TkGlobal import *
+from Tkinter import *
 from Tree import *
 
 # changing these strings requires changing DirectSession.py SGE_ strs too!

direct/src/tkwidgets/Slider.py

@@ -3,10 +3,11 @@ Slider Class: Velocity style controller for floating point values with
                a label, entry (validated), and min/max slider
 """
 from direct.showbase.TkGlobal import *
+from Tkinter import *
 from Valuator import *
 from direct.task import Task
 import math, sys, string
-import operator
+import operator, Pmw
 from pandac.PandaModules import ClockObject
 
 class Slider(Valuator):

direct/src/tkwidgets/Tree.py

@@ -19,6 +19,8 @@ import os
 import sys
 import string
 from direct.showbase.TkGlobal import *
+from Tkinter import *
+import Pmw
 from pandac.PandaModules import *
 
 # Initialize icon directory

direct/src/tkwidgets/Valuator.py

@@ -1,8 +1,9 @@
 from direct.showbase.DirectObject import *
 from direct.showbase.TkGlobal import *
+from Tkinter import *
 import tkColorChooser
 import WidgetPropertiesDialog
-import string
+import string, Pmw
 from direct.directtools.DirectUtil import getTkColorString
 
 VALUATOR_MINI = 'mini'

direct/src/tkwidgets/VectorWidgets.py

@@ -1,10 +1,12 @@
 from direct.showbase.TkGlobal import *
+from Tkinter import *
 import Valuator
 import Floater
 import Slider
 import string
 import tkColorChooser
 import types
+import Pmw
 
 class VectorEntry(Pmw.MegaWidget):
     def __init__(self, parent = None, **kw):

direct/src/tkwidgets/WidgetPropertiesDialog.py

@@ -1,6 +1,6 @@
 from direct.showbase.TkGlobal import *
-import types
+from Tkinter import *
-import string
+import types, string, Pmw
 
 """
 TODO: