From 1f3cc3b671d62b9929efcf6cfdb88d97c2baa1da Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 9 Aug 2006 22:32:50 +0000
Subject: [PATCH] more fixes for import

---
 direct/src/gui/DirectButton.py         | 6 ------
 direct/src/gui/DirectDialog.py         | 3 ++-
 direct/src/gui/DirectEntry.py          | 1 +
 direct/src/gui/DirectFrame.py          | 3 ++-
 direct/src/gui/DirectGui.py            | 2 +-
 direct/src/gui/DirectGuiGlobals.py     | 6 ++++++
 direct/src/interval/IntervalManager.py | 2 +-
 direct/src/showbase/Transitions.py     | 2 +-
 8 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/direct/src/gui/DirectButton.py b/direct/src/gui/DirectButton.py
index c23d93c4d3..110b4e5a38 100644
--- a/direct/src/gui/DirectButton.py
+++ b/direct/src/gui/DirectButton.py
@@ -6,12 +6,6 @@ from pandac.PandaModules import *
 import DirectGuiGlobals as DGG
 from DirectFrame import *
 
-# DirectButton States:
-BUTTON_READY_STATE     = PGButton.SReady       # 0
-BUTTON_DEPRESSED_STATE = PGButton.SDepressed   # 1
-BUTTON_ROLLOVER_STATE  = PGButton.SRollover    # 2
-BUTTON_INACTIVE_STATE  = PGButton.SInactive    # 3
-
 class DirectButton(DirectFrame):
     """
     DirectButton(parent) - Create a DirectGuiWidget which responds
diff --git a/direct/src/gui/DirectDialog.py b/direct/src/gui/DirectDialog.py
index 5afe510a7b..431e4a96fc 100644
--- a/direct/src/gui/DirectDialog.py
+++ b/direct/src/gui/DirectDialog.py
@@ -6,6 +6,7 @@ from pandac.PandaModules import *
 import DirectGuiGlobals as DGG
 from DirectFrame import *
 from DirectButton import *
+import types
 
 def findDialog(uniqueName):
     """findPanel(string uniqueName)
@@ -93,7 +94,7 @@ class DirectDialog(DirectFrame):
             ('text',              '',            None),
             ('text_align',        TextNode.ALeft,   None),
             ('text_scale',        0.06,          None),
-            ('image',  getDefaultDialogGeom(),   None),
+            ('image',  DGG.getDefaultDialogGeom(),   None),
             ('relief',            None,          None),
             ('buttonTextList',    [],            DGG.INITOPT),
             ('buttonGeomList',    [],            DGG.INITOPT),
diff --git a/direct/src/gui/DirectEntry.py b/direct/src/gui/DirectEntry.py
index e85e02e9f9..dbe44ae7b9 100644
--- a/direct/src/gui/DirectEntry.py
+++ b/direct/src/gui/DirectEntry.py
@@ -5,6 +5,7 @@ __all__ = ['DirectEntry']
 from pandac.PandaModules import *
 import DirectGuiGlobals as DGG
 from DirectFrame import *
+from OnscreenText import OnscreenText
 import string,types
 
 # DirectEntry States:
diff --git a/direct/src/gui/DirectFrame.py b/direct/src/gui/DirectFrame.py
index 79dd3e615c..7ed27c3564 100644
--- a/direct/src/gui/DirectFrame.py
+++ b/direct/src/gui/DirectFrame.py
@@ -5,7 +5,8 @@ __all__ = ['DirectFrame']
 from pandac.PandaModules import *
 import DirectGuiGlobals as DGG
 from DirectGuiBase import *
-from OnscreenImage import *
+from OnscreenImage import OnscreenImage
+from OnscreenGeom import OnscreenGeom
 import string, types
 
 class DirectFrame(DirectGuiWidget):
diff --git a/direct/src/gui/DirectGui.py b/direct/src/gui/DirectGui.py
index 624a58bf14..b792ccc4b2 100644
--- a/direct/src/gui/DirectGui.py
+++ b/direct/src/gui/DirectGui.py
@@ -1,6 +1,6 @@
 """Undocumented Module"""
 
-import DirectGuiGlobals
+import DirectGuiGlobals as DGG
 from OnscreenText import *
 from OnscreenGeom import *
 from OnscreenImage import *
diff --git a/direct/src/gui/DirectGuiGlobals.py b/direct/src/gui/DirectGuiGlobals.py
index da80b1896a..e6681da5ce 100644
--- a/direct/src/gui/DirectGuiGlobals.py
+++ b/direct/src/gui/DirectGuiGlobals.py
@@ -91,6 +91,12 @@ _OPT_DEFAULT         = 0
 _OPT_VALUE           = 1
 _OPT_FUNCTION        = 2
 
+# DirectButton States:
+BUTTON_READY_STATE     = PGButton.SReady       # 0
+BUTTON_DEPRESSED_STATE = PGButton.SDepressed   # 1
+BUTTON_ROLLOVER_STATE  = PGButton.SRollover    # 2
+BUTTON_INACTIVE_STATE  = PGButton.SInactive    # 3
+
 def getDefaultRolloverSound():
     global defaultRolloverSound
     if defaultRolloverSound == None:
diff --git a/direct/src/interval/IntervalManager.py b/direct/src/interval/IntervalManager.py
index b01d1aeb63..a8802029cf 100644
--- a/direct/src/interval/IntervalManager.py
+++ b/direct/src/interval/IntervalManager.py
@@ -1,6 +1,6 @@
 """Undocumented Module"""
 
-__all__ = ['IntervalManager']
+__all__ = ['IntervalManager', 'ivalMgr']
 
 from pandac.PandaModules import *
 from pandac import PandaModules
diff --git a/direct/src/showbase/Transitions.py b/direct/src/showbase/Transitions.py
index ba0add25a5..edcf6d5ec4 100644
--- a/direct/src/showbase/Transitions.py
+++ b/direct/src/showbase/Transitions.py
@@ -72,7 +72,7 @@ class Transitions:
                 relief = None,
                 image = self.fadeModel,
                 image_scale = 2 * base.getAspectRatio(),
-                state = NORMAL,
+                state = DGG.NORMAL,
                 )
 
             def rescaleFade():