PN

[tools/eficas.git] / Editeur / macrodisplay.py

diff --git a/Editeur/macrodisplay.py b/Editeur/macrodisplay.py
index 971dd10c25ff6f4719e7fb94373c06919093fa6b..7d769e9f550fd6d4ea8aa5939390acc799d47a07 100644 (file)
--- a/Editeur/macrodisplay.py
+++ b/Editeur/macrodisplay.py
@@ -23,7 +23,7 @@
    des sous commandes d'une macro sous forme d'arbre
 """
 # Modules Python
-import types
+import types,sys
 import Tkinter,Pmw
 
 # Modules EFICAS
@@ -33,6 +33,7 @@ import Objecttreeitem
 import compojdc
 import treewidget
 from widgets import Fenetre
+from Ihm import CONNECTOR
 
 class MACRO2TreeItem(compojdc.JDCTreeItem):
       pass
@@ -61,9 +62,12 @@ class MacroDisplay:
     Pmw.Color.changecolor(self.canvas,background='gray95')
     self.mainPart.pack(padx=10,pady=10,fill = 'both', expand = 1)
     self.item=MACRO2TreeItem(self.appli,nom_jdc,self.jdc)
-    import treewidget
     self.tree = treewidget.Tree(self.appli,self.item,self.mainPart,command=None,rmenu=self.make_rmenu)
     self.tree.draw()
+    CONNECTOR.Connect(self.jdc,"close",self.onCloseView,())
+
+  def onCloseView(self):
+    self.quit()
 
   def visufile(self):
     Fenetre(self.appli,titre="Source du fichier inclus",texte=self.macroitem.object.fichier_text)
@@ -108,16 +112,20 @@ class MacroDisplay:
       if radio:menu.invoke(radio)
 
   def quit(self):
-    try:
-       self.macroitem.views.remove(self)
-    except:
-       pass
+    #print "quit",self
+    self.tree.supprime()
+    self.tree=None
     self.fenetre.destroy()
 
+  #def __del__(self):
+  #  print "__del__",self
+
 def makeMacroDisplay(appli,macroitem,nom_item):
   return MacroDisplay(appli,macroitem,nom_item)
 
-class TREEITEMINCANVAS:
+import treeitemincanvas
+
+class TREEITEMINCANVAS(treeitemincanvas.TREEITEMINCANVAS):
    def __init__(self,object,nom="",parent=None,appli=None,sel=None,rmenu=None):
       #print "TREEITEMINCANVAS",object
       self.object=object
@@ -134,13 +142,6 @@ class TREEITEMINCANVAS:
       self.tree=treewidget.Tree(self.appli,self.item,self.canvas,command=sel,rmenu=rmenu)
       self.tree.draw()
 
-   def mainloop(self):
-      self.parent.mainloop()
-
-   def update(self):
-      """Cette methode est utilisee pour signaler une mise a jour des objets associes"""
-      self.tree.update()
-
 import jdcdisplay
 
 class MACRODISPLAY(jdcdisplay.JDCDISPLAY):