From f05f56ebf17facdc5036bedf010eb8ad3eacd5d8 Mon Sep 17 00:00:00 2001 From: Mike Goslin Date: Sat, 9 Dec 2000 00:28:26 +0000 Subject: [PATCH] *** empty log message *** --- direct/src/gui/PickList.py | 27 +++++++++++++++------------ direct/src/showbase/DirectObject.py | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/direct/src/gui/PickList.py b/direct/src/gui/PickList.py index e7dce833bb..d857276ecd 100644 --- a/direct/src/gui/PickList.py +++ b/direct/src/gui/PickList.py @@ -32,25 +32,28 @@ class PickList(PandaObject.PandaObject): # display the menu self.__displayChoices(choiceList) + self.isClean = 0 return None def cleanup(self): """cleanup(self) """ - # remove keyboard events - self.ignore("up-up") - self.ignore("down-up") - self.ignore("enter-up") + if self.isClean == 0: + self.isClean = 1 + # remove keyboard events + self.ignore("up-up") + self.ignore("down-up") + self.ignore("enter-up") - # ignore all the buttons - for item in self.frame.getItems(): - self.ignore(item.getGuiItem().getUpEvent()) - self.ignore(item.getGuiItem().getUpRolloverEvent()) - self.ignore(item.getGuiItem().getDownRolloverEvent()) + # ignore all the buttons + for item in self.frame.getItems(): + self.ignore(item.getGuiItem().getUpEvent()) + self.ignore(item.getGuiItem().getUpRolloverEvent()) + self.ignore(item.getGuiItem().getDownRolloverEvent()) - # reset the display - self.frame.unmanage() - self.frame = None + # reset the display + self.frame.unmanage() + self.frame = None return None # accessing diff --git a/direct/src/showbase/DirectObject.py b/direct/src/showbase/DirectObject.py index 280b12da08..c194a285ed 100644 --- a/direct/src/showbase/DirectObject.py +++ b/direct/src/showbase/DirectObject.py @@ -11,7 +11,7 @@ class DirectObject: """ try: self.cleanup() - except: + except NameError: print "No cleanup() method defined!" # Event Handling