*** empty log message ***

direct/src/gui/PickList.py

@@ -36,13 +36,6 @@ class PickList(PandaObject.PandaObject):
     def __del__(self):
 	"""__del__(self)
 	"""
-	self.cleanup()
-	return None
-        
-    def cleanup(self):
-        """cleanup(self)
-        Remove events and cleanup the display
-        """
         # remove keyboard events
         self.ignore("up-up")
         self.ignore("down-up")
@@ -57,7 +50,8 @@ class PickList(PandaObject.PandaObject):
         # reset the display
         self.frame.unmanage()
         del(self.frame)
-
+	return None
+        
     # accessing
     def getName(self):
         return self.name

direct/src/gui/ScrollingLabel.py

@@ -82,15 +82,6 @@ class ScrollingLabel(PandaObject.PandaObject):
     def __del__(self):
 	"""__del__(self)
 	"""
-	self.cleanup()
-	del(self.label)
-	del(self.title)
-	del(self.itemSign)
-	del(self.leftButton)
-	del(self.rightButton)
-	return None
-
-    def cleanup(self):
         # remove gui items
         del(self.frame)
         del(self.items)
@@ -99,7 +90,14 @@ class ScrollingLabel(PandaObject.PandaObject):
         self.ignore(self.name + "-left")
         self.ignore(self.name + "-right")
         self.setKeyFocus(0)
-        
+
+	del(self.label)
+	del(self.title)
+	del(self.itemSign)
+	del(self.leftButton)
+	del(self.rightButton)
+	return None
+
     # accessing
     def getTitle(self):
         return self.name