--- a/controls/VariablePanel.py	Thu Sep 26 20:47:36 2013 +0900
+++ b/controls/VariablePanel.py	Fri Sep 27 09:32:39 2013 +0900
@@ -173,7 +173,7 @@
                             if var_class not in ["External", "InOut"]:
                                 if self.Parent.Controler.IsEnumeratedType(var_type):
                                     editor = wx.grid.GridCellChoiceEditor()
-                                    editor.SetParameters(",".join(self.Parent.Controler.GetEnumeratedDataValues(var_type)))
+                                    editor.SetParameters(",".join([""] + self.Parent.Controler.GetEnumeratedDataValues(var_type)))
                                 else:
                                     editor = wx.grid.GridCellTextEditor()
                                 renderer = wx.grid.GridCellStringRenderer()
@@ -618,7 +618,7 @@
         if poutype != "function" and bodytype in ["ST", "IL"]:
             return False
         else:
-            return name in self.Controler.GetFunctionBlockTypes(self.TagName)
+            return self.Controler.GetBlockType(name, debug=self.Debug) is not None
     
     def RefreshView(self):
         self.PouNames = self.Controler.GetProjectPouNames(self.Debug)
@@ -635,7 +635,7 @@
                 self.ReturnType.Clear()
                 for data_type in self.Controler.GetDataTypes(self.TagName, debug=self.Debug):
                     self.ReturnType.Append(data_type)
-                returnType = self.Controler.GetEditedElementInterfaceReturnType(self.TagName)
+                returnType, (var_tree, dimensions) = self.Controler.GetEditedElementInterfaceReturnType(self.TagName, self.Debug)
             description = self.Controler.GetPouDescription(words[1])
             self.Values = self.Controler.GetEditedElementInterfaceVars(self.TagName, self.Debug)