# HG changeset patch
# User Edouard TISSERANT <edouard.tisserant@gmail.com>
# Date 1259779327 -3600
# Node ID 5c26470e82a5eb428bfdbd9bca250707f6ccc6a8
# Parent  765b741fc38f12f1cec2026e480c7313d20054c1# Parent  9abbc90c02633e9c674ffce6f4f356fc4352c881
merge

diff -r 765b741fc38f -r 5c26470e82a5 DataTypeEditor.py
--- a/DataTypeEditor.py	Wed Dec 02 13:11:02 2009 +0100
+++ b/DataTypeEditor.py	Wed Dec 02 19:42:07 2009 +0100
@@ -800,16 +800,16 @@
                 self.Bind(wx.EVT_MENU, self.GetElementTypeFunction(base_type), id=new_id)
             type_menu.AppendMenu(wx.NewId(), _("Base Types"), base_menu)
             datatype_menu = wx.Menu(title='')
-            for datatype in self.Controler.GetDataTypes(self.TagName, False, self.ParentWindow.Debug):
+            for datatype in self.Controler.GetDataTypes(self.TagName, False):
                 new_id = wx.NewId()
                 AppendMenu(datatype_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=datatype)
                 self.Bind(wx.EVT_MENU, self.GetElementTypeFunction(datatype), id=new_id)
             type_menu.AppendMenu(wx.NewId(), _("User Data Types"), datatype_menu)
 ##            functionblock_menu = wx.Menu(title='')
-##            bodytype = self.Controler.GetEditedElementBodyType(self.TagName, self.ParentWindow.Debug)
-##            pouname, poutype = self.Controler.GetEditedElementType(self.TagName, self.ParentWindow.Debug)
+##            bodytype = self.Controler.GetEditedElementBodyType(self.TagName)
+##            pouname, poutype = self.Controler.GetEditedElementType(self.TagName)
 ##            if classtype in ["Input","Output","InOut","External","Global"] or poutype != "function" and bodytype in ["ST", "IL"]:
-##                for functionblock_type in self.Controler.GetFunctionBlockTypes(self.TagName, self.ParentWindow.Debug):
+##                for functionblock_type in self.Controler.GetFunctionBlockTypes(self.TagName):
 ##                    new_id = wx.NewId()
 ##                    AppendMenu(functionblock_menu, help='', id=new_id, kind=wx.ITEM_NORMAL, text=functionblock_type)
 ##                    self.Bind(wx.EVT_MENU, self.GetVariableTypeFunction(functionblock_type), id=new_id)