From 9e5535d6f789befdf1e0b64414a292811beb0c15 Mon Sep 17 00:00:00 2001 From: Justin Butler Date: Thu, 10 Aug 2006 20:51:50 +0000 Subject: [PATCH] import change fix --- direct/src/showbase/TkGlobal.py | 1 + direct/src/showbase/Transitions.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/direct/src/showbase/TkGlobal.py b/direct/src/showbase/TkGlobal.py index 75d5820a51..ee57fd544e 100644 --- a/direct/src/showbase/TkGlobal.py +++ b/direct/src/showbase/TkGlobal.py @@ -1,6 +1,7 @@ from Tkinter import * import Pmw import sys +from direct.task import Task # This is required by the ihooks.py module used by Squeeze (used by # pandaSqueezer.py) so that Pmw initializes properly sys.modules['_Pmw'].__name__ = '_Pmw' diff --git a/direct/src/showbase/Transitions.py b/direct/src/showbase/Transitions.py index edcf6d5ec4..8b4caf4272 100644 --- a/direct/src/showbase/Transitions.py +++ b/direct/src/showbase/Transitions.py @@ -276,8 +276,8 @@ class Transitions: self.letterboxTop = DirectFrame( parent = self.letterbox, guiId = 'letterboxTop', - relief = FLAT, - state = NORMAL, + relief = DGG.FLAT, + state = DGG.NORMAL, frameColor = (0, 0, 0, 1), borderWidth = (0, 0), frameSize = (-1, 1, 0, 0.2), @@ -286,8 +286,8 @@ class Transitions: self.letterboxBottom = DirectFrame( parent = self.letterbox, guiId = 'letterboxBottom', - relief = FLAT, - state = NORMAL, + relief = DGG.FLAT, + state = DGG.NORMAL, frameColor = (0, 0, 0, 1), borderWidth = (0, 0), frameSize = (-1, 1, 0, 0.2),