# HG changeset patch
# User laurent
# Date 1326837147 -3600
# Node ID f2266a8517e46039b10287f2d3d3f8200ad57abf
# Parent  5056f17a0c6b41cf7c1b2cdcfe690b5a6f316741# Parent  84e07afaabf31c583e0ce401fe7528f710da2477
Merging with modifications from Edouard

diff -r 84e07afaabf3 -r f2266a8517e4 Beremiz.py
--- a/Beremiz.py	Thu Jan 12 17:45:58 2012 +0100
+++ b/Beremiz.py	Tue Jan 17 22:52:27 2012 +0100
@@ -1099,7 +1099,6 @@
             for location in plugin_locations:
                 locations_infos["root"]["children"].append("root.%s" % location["name"])
                 self.GenerateLocationTreeBranch(treectrl, treectrl.GetRootItem(), locations_infos, "root", location)
-                treectrl.Expand(treectrl.GetRootItem())
             if locations_infos["root"]["expanded"]:
                 self.PluginTreeSizer.Layout()
                 self.ExpandLocation(locations_infos, "root")
diff -r 84e07afaabf3 -r f2266a8517e4 plugins/c_ext/CFileEditor.py
--- a/plugins/c_ext/CFileEditor.py	Thu Jan 12 17:45:58 2012 +0100
+++ b/plugins/c_ext/CFileEditor.py	Tue Jan 17 22:52:27 2012 +0100
@@ -474,7 +474,7 @@
             for col in range(self.GetNumberCols()):
                 editor = None
                 renderer = None
-                colname = self.GetColLabelValue(col)
+                colname = self.GetColLabelValue(col, False)
                 
                 if colname == "Name":
                     editor = wx.grid.GridCellTextEditor()