Ver código fonte

*** empty log message ***

Mike Goslin 25 anos atrás
pai
commit
4c0f5a41f7

+ 7 - 1
direct/src/gui/OnscreenText.py

@@ -36,7 +36,13 @@ class OnscreenText(PandaObject, NodePath):
 
 
         # assume 4:3 aspect ratio
         # assume 4:3 aspect ratio
         self.setScale( 0.069, 1.0, 0.069)
         self.setScale( 0.069, 1.0, 0.069)
-        
+
+    def __del__(self):
+	"""__del__(self)
+	"""
+	del(self.textNode)
+       	NodePath.__del__(self) 
+	return None
  
  
     def setText(self, string):
     def setText(self, string):
         """setText(self, string)
         """setText(self, string)

+ 6 - 0
direct/src/gui/PickList.py

@@ -32,6 +32,12 @@ class PickList(PandaObject.PandaObject):
         
         
         # display the menu
         # display the menu
         self.__displayChoices(choiceList)
         self.__displayChoices(choiceList)
+
+    def __del__(self):
+	"""__del__(self)
+	"""
+	self.cleanup()
+	return None
         
         
     def cleanup(self):
     def cleanup(self):
         """cleanup(self)
         """cleanup(self)

+ 10 - 0
direct/src/gui/ScrollingLabel.py

@@ -79,6 +79,16 @@ class ScrollingLabel(PandaObject.PandaObject):
         # refresh the frame
         # refresh the frame
         self.frame.recompute()
         self.frame.recompute()
 
 
+    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):
     def cleanup(self):
         # remove gui items
         # remove gui items

+ 53 - 53
direct/src/gui/Sign.py

@@ -1,53 +1,53 @@
-from ShowBaseGlobal import *
-import GuiSign
-import GuiManager
-
-guiMgr = GuiManager.GuiManager.getPtr(base.win, base.mak.node())
-
-class Sign:
-
-    def __init__(self, name, label):
-        self.name = name
-        self.label = label
-        self.sign = GuiSign.GuiSign(name, label)
-        self.setScale(0.1)
-        self.managed = 0
-
-    def __del__(self):
-        if (self.managed):
-            self.unmanage()
-        del(self.sign)
-
-    def __str__(self):
-        return "sign: %s contains label: %s" % (self.name, self.label.name)
-    
-    # accessing
-    def getName(self):
-        return self.name
-
-    def setText(self, text):
-        self.label.setText(text)
-        
-    def getLabel(self):
-        return self.label
-    
-    def getGuiItem(self):
-        return self.sign
-        
-    def setScale(self, scale):
-        self.sign.setScale(scale)
-
-    def getWidth(self):
-        return self.label.getWidth()
-
-    def setWidth(self, width):
-        self.label.setWidth(width)
-        
-    # actions
-    def manage(self):
-        self.managed = 1
-        self.sign.manage(guiMgr, base.eventMgr.eventHandler)
-
-    def unmanage(self):
-        self.managed = 0
-        self.sign.unmanage()
+from ShowBaseGlobal import *
+import GuiSign
+import GuiManager
+
+guiMgr = GuiManager.GuiManager.getPtr(base.win, base.mak.node())
+
+class Sign:
+
+    def __init__(self, name, label):
+        self.name = name
+        self.label = label
+        self.sign = GuiSign.GuiSign(name, label)
+        self.setScale(0.1)
+        self.managed = 0
+
+    def __del__(self):
+        if (self.managed):
+            self.unmanage()
+        del(self.sign)
+
+    def __str__(self):
+        return "sign: %s contains label: %s" % (self.name, self.label.name)
+    
+    # accessing
+    def getName(self):
+        return self.name
+
+    def setText(self, text):
+        self.label.setText(text)
+        
+    def getLabel(self):
+        return self.label
+    
+    def getGuiItem(self):
+        return self.sign
+        
+    def setScale(self, scale):
+        self.sign.setScale(scale)
+
+    def getWidth(self):
+        return self.label.getWidth()
+
+    def setWidth(self, width):
+        self.label.setWidth(width)
+        
+    # actions
+    def manage(self):
+        self.managed = 1
+        self.sign.manage(guiMgr, base.eventMgr.eventHandler)
+
+    def unmanage(self):
+        self.managed = 0
+        self.sign.unmanage()