# HG changeset patch # User laurent # Date 1329263064 -3600 # Node ID d376a8b0b602fe751c0af91353b3912a0fd58d75 # Parent 383864958dacd2d149e4daf43f525def26a7a166# Parent 57aa9da845d5f682dc8ffbb41342c6e96f2a1a67 Merge with Edouard's Modifications diff -r 57aa9da845d5 -r d376a8b0b602 LPCBeremiz.py --- a/LPCBeremiz.py Wed Feb 15 00:32:01 2012 +0100 +++ b/LPCBeremiz.py Wed Feb 15 00:44:24 2012 +0100 @@ -1146,6 +1146,8 @@ leftwindowsizer = wx.BoxSizer(wx.HORIZONTAL) leftwindowvsizer.AddSizer(leftwindowsizer, 0, border=0, flag=0) + self.GenerateEnableButton(leftwindow, leftwindowsizer, plugin) + st = wx.StaticText(leftwindow, -1) st.SetFont(wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"])) st.SetLabel(plugin.GetFullIEC_Channel()) diff -r 57aa9da845d5 -r d376a8b0b602 targets/Win32/plc_Win32_main.c --- a/targets/Win32/plc_Win32_main.c Wed Feb 15 00:32:01 2012 +0100 +++ b/targets/Win32/plc_Win32_main.c Wed Feb 15 00:44:24 2012 +0100 @@ -244,10 +244,12 @@ void Retain(unsigned int offset, unsigned int count, void * p) { + /* unsigned int position; for(position=0; position