--- a/PLCOpenEditor.py	Wed Feb 07 18:43:32 2007 +0100
+++ b/PLCOpenEditor.py	Thu Feb 08 17:41:41 2007 +0100
@@ -441,23 +441,21 @@
         self.Bind(wx.EVT_TOOL, self.OnLDBranchTool, 
               id=wxID_PLCOPENEDITORLDTOOLBARITEMS4)
     
-    def init_toolbars(self, parent):
+    def init_toolbars(self):
         self.DefaultToolBar = wxToolBar(id=wxID_PLCOPENEDITORDEFAULTTOOLBAR, name='DefaultToolBar',
-              parent=parent, pos=wx.Point(0, 27), size=wx.Size(0, 0),
+              parent=self, pos=wx.Point(0, 27), size=wx.Size(0, 0),
               style=wxTB_HORIZONTAL | wxNO_BORDER)
-        self.Bind(wx.EVT_LEFT_DCLICK, self.OnDefaultToolDCLick, 
-              id=wxID_PLCOPENEDITORDEFAULTTOOLBAR)
 
         self.SFCToolBar = wxToolBar(id=wxID_PLCOPENEDITORSFCTOOLBAR, name='SFCToolBar',
-              parent=parent, pos=wx.Point(0, 27), size=wx.Size(0, 0),
+              parent=self, pos=wx.Point(0, 27), size=wx.Size(0, 0),
               style=wxTB_HORIZONTAL | wxNO_BORDER)
         
         self.FBDToolBar = wxToolBar(id=wxID_PLCOPENEDITORFBDTOOLBAR, name='FBDToolBar',
-              parent=parent, pos=wx.Point(0, 27), size=wx.Size(0, 0),
+              parent=self, pos=wx.Point(0, 27), size=wx.Size(0, 0),
               style=wxTB_HORIZONTAL | wxNO_BORDER)
         
         self.LDToolBar = wxToolBar(id=wxID_PLCOPENEDITORLDTOOLBAR, name='LDToolBar',
-              parent=parent, pos=wx.Point(0, 27), size=wx.Size(0, 0),
+              parent=self, pos=wx.Point(0, 27), size=wx.Size(0, 0),
               style=wxTB_HORIZONTAL | wxNO_BORDER)
               
         self.init_coll_DefaultToolBar_Items(self.DefaultToolBar)
@@ -467,22 +465,18 @@
 
     def __init__(self, parent):
         self._init_ctrls(parent)
-        self.init_toolbars(self)
+        self.init_toolbars()
         
         self.Controler = PLCControler()
         
         if fileOpen:
             self.Controler.OpenXMLFile(fileOpen)
             self.RefreshProjectTree()
-
+        
         self.RefreshFileMenu()
         self.RefreshEditMenu()
         self.RefreshToolBar()
 
-    def OnDefaultToolDCLick(self, event):
-        print "Default ToolBar DClick"
-        event.Skip()
-
     def RefreshFileMenu(self):
         if self.Controler.HasOpenedProject():
             if self.TabsOpened.GetPageCount() > 0:
@@ -621,6 +615,20 @@
         self.Close()
         event.Skip()
 
+    def ResetCurrentMode(self):
+        selected = self.TabsOpened.GetSelection()
+        if selected != -1:
+            self.TabsOpened.GetPage(selected).SetMode(MODE_SELECTION)
+        language = self.Controler.GetCurrentElementEditingBodyType()
+        if language == "SFC":
+            self.SFCToolBar.ToggleTool(wxID_PLCOPENEDITORSFCTOOLBARITEMS0, True)
+        elif language == "FBD":
+            self.FBDToolBar.ToggleTool(wxID_PLCOPENEDITORFBDTOOLBARITEMS0, True)
+        elif language == "LD":
+            self.LDToolBar.ToggleTool(wxID_PLCOPENEDITORLDTOOLBARITEMS0, True)
+        else:
+            self.DefaultToolBar.ToggleTool(wxID_PLCOPENEDITORDEFAULTTOOLBARITEMS0, True)
+
     def OnSelectionTool(self, event):
         selected = self.TabsOpened.GetSelection()
         if selected != -1:
@@ -1005,33 +1013,30 @@
     def RefreshToolBar(self):
         language = self.Controler.GetCurrentElementEditingBodyType()
         if language == "SFC":
-            self.SFCToolBar.ToggleTool(0, True)
             self.SFCToolBar.Show()
             self.SetToolBar(self.SFCToolBar)
             self.DefaultToolBar.Hide()
             self.FBDToolBar.Hide()
             self.LDToolBar.Hide()
         elif language == "FBD":
-            self.FBDToolBar.ToggleTool(0, True)
             self.FBDToolBar.Show()
             self.SetToolBar(self.FBDToolBar)
             self.DefaultToolBar.Hide()
             self.SFCToolBar.Hide()
             self.LDToolBar.Hide()
         elif language == "LD":
-            self.LDToolBar.ToggleTool(0, True)
             self.LDToolBar.Show()
             self.SetToolBar(self.LDToolBar)
             self.DefaultToolBar.Hide()
             self.SFCToolBar.Hide()
             self.FBDToolBar.Hide()
         else:
-            self.DefaultToolBar.ToggleTool(0, True)
             self.DefaultToolBar.Show()
             self.SetToolBar(self.DefaultToolBar)
             self.SFCToolBar.Hide()
             self.FBDToolBar.Hide()
             self.LDToolBar.Hide()
+        self.ResetCurrentMode()
 
     def RefreshTabsOpenedTitles(self):
         pous = self.Controler.GetElementsOpenedNames()