--- a/PLCOpenEditor.py Wed Jan 14 19:47:06 2009 +0100
+++ b/PLCOpenEditor.py Fri Jan 16 13:22:07 2009 +0100
@@ -2807,9 +2807,9 @@
label='Language (optional):', name='staticText10', parent=self.MiscellaneousPanel,
pos=wx.Point(0, 0), size=wx.Size(200, 17), style=0)
- self.Language = wx.Choice(id=ID_PROJECTDIALOGLANGUAGE,
+ self.Language = wx.ComboBox(id=ID_PROJECTDIALOGLANGUAGE,
name='Language', parent=self.MiscellaneousPanel, pos=wx.Point(0, 0),
- size=wx.Size(0, 24), style=0)
+ size=wx.Size(0, 24), style=wx.CB_READONLY)
self.staticText11 = wx.StaticText(id=ID_PROJECTDIALOGSTATICTEXT11,
label='Content Description (optional):', name='staticText11', parent=self.MiscellaneousPanel,
@@ -3035,18 +3035,18 @@
label='POU Type:', name='staticText2', parent=self,
pos=wx.Point(0, 0), size=wx.Size(100, 17), style=0)
- self.PouType = wx.Choice(id=ID_POUDIALOGPOUTYPE,
+ self.PouType = wx.ComboBox(id=ID_POUDIALOGPOUTYPE,
name='POUType', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(0, 24), style=0)
- self.Bind(wx.EVT_CHOICE, self.OnTypeChanged, id=ID_POUDIALOGPOUTYPE)
+ size=wx.Size(0, 24), style=wx.CB_READONLY)
+ self.Bind(wx.EVT_COMBOBOX, self.OnTypeChanged, id=ID_POUDIALOGPOUTYPE)
self.staticText3 = wx.StaticText(id=ID_POUDIALOGSTATICTEXT3,
label='Language:', name='staticText3', parent=self,
pos=wx.Point(0, 0), size=wx.Size(100, 17), style=0)
- self.Language = wx.Choice(id=ID_POUDIALOGLANGUAGE,
+ self.Language = wx.ComboBox(id=ID_POUDIALOGLANGUAGE,
name='Language', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(0, 24), style=0)
+ size=wx.Size(0, 24), style=wx.CB_READONLY)
self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE)
self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
@@ -3207,9 +3207,9 @@
label='Language:', name='staticText2', parent=self,
pos=wx.Point(0, 0), size=wx.Size(120, 17), style=0)
- self.Language = wx.Choice(id=ID_POUTRANSITIONDIALOGLANGUAGE,
+ self.Language = wx.ComboBox(id=ID_POUTRANSITIONDIALOGLANGUAGE,
name='Language', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(0, 24), style=0)
+ size=wx.Size(0, 24), style=wx.CB_READONLY)
self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE)
self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
@@ -3346,9 +3346,9 @@
label='Language:', name='staticText2', parent=self,
pos=wx.Point(0, 0), size=wx.Size(100, 17), style=0)
- self.Language = wx.Choice(id=ID_POUACTIONDIALOGLANGUAGE,
+ self.Language = wx.ComboBox(id=ID_POUACTIONDIALOGLANGUAGE,
name='Language', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(0, 24), style=0)
+ size=wx.Size(0, 24), style=wx.CB_READONLY)
self.ButtonSizer = self.CreateButtonSizer(wx.OK|wx.CANCEL|wx.CENTRE)
self.Bind(wx.EVT_BUTTON, self.OnOK, id=self.ButtonSizer.GetAffirmativeButton().GetId())
@@ -3962,19 +3962,19 @@
label='Return Type:', name='staticText1', parent=self,
pos=wx.Point(0, 0), size=wx.Size(95, 17), style=0)
- self.ReturnType = wx.Choice(id=ID_VARIABLEEDITORPANELRETURNTYPE,
+ self.ReturnType = wx.ComboBox(id=ID_VARIABLEEDITORPANELRETURNTYPE,
name='ReturnType', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(145, 24), style=0)
- self.Bind(wx.EVT_CHOICE, self.OnReturnTypeChanged, id=ID_VARIABLEEDITORPANELRETURNTYPE)
+ size=wx.Size(145, 24), style=wx.CB_READONLY)
+ self.Bind(wx.EVT_COMBOBOX, self.OnReturnTypeChanged, id=ID_VARIABLEEDITORPANELRETURNTYPE)
self.staticText2 = wx.StaticText(id=ID_VARIABLEEDITORPANELSTATICTEXT2,
label='Class Filter:', name='staticText2', parent=self,
pos=wx.Point(0, 0), size=wx.Size(95, 17), style=0)
- self.ClassFilter = wx.Choice(id=ID_VARIABLEEDITORPANELCLASSFILTER,
+ self.ClassFilter = wx.ComboBox(id=ID_VARIABLEEDITORPANELCLASSFILTER,
name='ClassFilter', parent=self, pos=wx.Point(0, 0),
- size=wx.Size(145, 24), style=0)
- self.Bind(wx.EVT_CHOICE, self.OnClassFilter, id=ID_VARIABLEEDITORPANELCLASSFILTER)
+ size=wx.Size(145, 24), style=wx.CB_READONLY)
+ self.Bind(wx.EVT_COMBOBOX, self.OnClassFilter, id=ID_VARIABLEEDITORPANELCLASSFILTER)
self.VariablesGrid = wx.grid.Grid(id=ID_VARIABLEEDITORPANELVARIABLESGRID,
name='VariablesGrid', parent=self, pos=wx.Point(0, 0),