PN

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

diff --git a/Editeur/compomacro.py b/Editeur/compomacro.py
index bafed5540d6944578b778010c695bc3b01a1c762..543391d67023e9eb493e8ea8d9a56d97727f62f4 100644 (file)
--- a/Editeur/compomacro.py
+++ b/Editeur/compomacro.py
@@ -34,11 +34,10 @@ import convert
 from widgets import askopenfilename
 from widgets import Fenetre,FenetreYesNo
 from widgets import showinfo,showerror
-from Ihm import CONNECTOR
 
 #
 __version__="$Name:  $"
-__Id__="$Id: compomacro.py,v 1.22 2005/06/10 13:47:49 eficas Exp $"
+__Id__="$Id: compomacro.py,v 1.24 2005/11/03 09:03:48 eficas Exp $"
 #
 
 class MACROPanel(panels.OngletPanel):
@@ -70,6 +69,8 @@ class MACROPanel(panels.OngletPanel):
     self.makeParamCommentPage_for_etape(nb.page("Commentaire"))
     nb.tab('Mocles').focus_set()
     nb.setnaturalsize()
+    self.enlevebind()
+    self.creebind()
     self.affiche()
 
   def makeFichierPage(self,page):
@@ -208,17 +209,10 @@ class INCLUDETreeItemBase(MACROTreeItem):
     if not hasattr(self.object,"jdc_aux") or self.object.jdc_aux is None:
        #L'include n'est pas initialise
        self.object.build_include(None,"")
-    self.parent_node=node
     # On cree un nouvel onglet dans le bureau
     appli.bureau.ShowJDC(self.object.jdc_aux,self.object.jdc_aux.nom,
                              label_onglet=None,
                              JDCDISPLAY=macrodisplay.MACRODISPLAY)
-    self.myjdc=appli.bureau.JDCDisplay_courant
-    self.myjdc.fichier=self.object.fichier_ini
-
-  def onClose(self):
-    #print "onClose",self
-    self.appli.bureau.closeJDCDISPLAY(self.myjdc)
 
   def makeView(self,appli,node):
     if not hasattr(self.object,"jdc_aux") or self.object.jdc_aux is None:
@@ -231,11 +225,6 @@ class INCLUDETreeItemBase(MACROTreeItem):
        else:
           nom=nom+' '+self.object.fichier_ini
     macdisp=macrodisplay.makeMacroDisplay(appli,self,nom)
-    CONNECTOR.Connect(self.object.jdc_aux,"close",self.onCloseView,(macdisp,))
-
-  def onCloseView(self,macdisp):
-    #print "onCloseView",self,macdisp
-    macdisp.quit()
 
 class INCLUDEPanel(MACROPanel):
   def makeFichierPage(self,page):
@@ -258,13 +247,10 @@ class POURSUITETreeItem(INCLUDETreeItemBase):
        text="""DEBUT()
 FIN()"""
        self.object.build_poursuite(None,text)
-    self.parent_node=node
     # On cree un nouvel onglet dans le bureau
     appli.bureau.ShowJDC(self.object.jdc_aux,self.object.jdc_aux.nom,
                              label_onglet=None,
                              JDCDISPLAY=macrodisplay.MACRODISPLAY)
-    self.myjdc=appli.bureau.JDCDisplay_courant
-    self.myjdc.fichier=self.object.fichier_ini
 
   def makeView(self,appli,node):
     if not hasattr(self.object,"jdc_aux") or self.object.jdc_aux is None:
@@ -277,7 +263,6 @@ FIN()"""
        else:
           nom=nom+' '+self.object.fichier_ini
     macdisp=macrodisplay.makeMacroDisplay(appli,self,nom)
-    CONNECTOR.Connect(self.object.jdc_aux,"close",self.onCloseView,(macdisp,))
 
 class INCLUDE_MATERIAUTreeItem(INCLUDETreeItemBase):
   rmenu_specs=[("View","makeView"),