Replacing wx.Choice by wx.ComboBox
authorlbessard
Fri, 16 Jan 2009 13:22:07 +0100
changeset 304 2df3d31d8059
parent 303 b4583cb86f18
child 305 0ed2b61de43e
Replacing wx.Choice by wx.ComboBox
DataTypeEditor.py
Dialogs.py
PLCOpenEditor.py
--- a/DataTypeEditor.py	Wed Jan 14 19:47:06 2009 +0100
+++ b/DataTypeEditor.py	Fri Jan 16 13:22:07 2009 +0100
@@ -350,10 +350,10 @@
               label='Derivation Type:', name='staticText1', parent=self,
               pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
 
-        self.DerivationType = wx.Choice(id=ID_DATATYPEEDITORDERIVATIONTYPE,
+        self.DerivationType = wx.ComboBox(id=ID_DATATYPEEDITORDERIVATIONTYPE,
               name='DerivationType', parent=self, pos=wx.Point(0, 0),
-              size=wx.Size(200, 24), style=0)
-        self.Bind(wx.EVT_CHOICE, self.OnDerivationTypeChanged, id=ID_DATATYPEEDITORDERIVATIONTYPE)
+              size=wx.Size(200, 24), style=wx.CB_READONLY)
+        self.Bind(wx.EVT_COMBOBOX, self.OnDerivationTypeChanged, id=ID_DATATYPEEDITORDERIVATIONTYPE)
 
         # Panel for Directly derived data types
 
@@ -365,10 +365,10 @@
               label='Base Type:', name='staticText2', parent=self.DirectlyPanel,
               pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
 
-        self.DirectlyBaseType = wx.Choice(id=ID_DATATYPEEDITORDIRECTLYBASETYPE, 
+        self.DirectlyBaseType = wx.ComboBox(id=ID_DATATYPEEDITORDIRECTLYBASETYPE, 
               name='DirectlyBaseType', parent=self.DirectlyPanel, pos=wx.Point(0, 0),
-              size=wx.Size(0, 24), style=wx.TAB_TRAVERSAL)
-        self.Bind(wx.EVT_CHOICE, self.OnInfosChanged, id=ID_DATATYPEEDITORDIRECTLYBASETYPE)
+              size=wx.Size(0, 24), style=wx.CB_READONLY)
+        self.Bind(wx.EVT_COMBOBOX, self.OnInfosChanged, id=ID_DATATYPEEDITORDIRECTLYBASETYPE)
 
         self.staticText3 = wx.StaticText(id=ID_DATATYPEEDITORSTATICTEXT3,
               label='Initial Value:', name='staticText3', parent=self.DirectlyPanel,
@@ -389,10 +389,10 @@
               label='Base Type:', name='staticText4', parent=self.SubrangePanel,
               pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
 
-        self.SubrangeBaseType = wx.Choice(id=ID_DATATYPEEDITORSUBRANGEBASETYPE, 
+        self.SubrangeBaseType = wx.ComboBox(id=ID_DATATYPEEDITORSUBRANGEBASETYPE, 
               name='SubrangeBaseType', parent=self.SubrangePanel, pos=wx.Point(0, 0),
-              size=wx.Size(0, 24), style=wx.TAB_TRAVERSAL)
-        self.Bind(wx.EVT_CHOICE, self.OnSubrangeBaseTypeChanged, id=ID_DATATYPEEDITORSUBRANGEBASETYPE)
+              size=wx.Size(0, 24), style=wx.CB_READONLY)
+        self.Bind(wx.EVT_COMBOBOX, self.OnSubrangeBaseTypeChanged, id=ID_DATATYPEEDITORSUBRANGEBASETYPE)
 
         self.staticText5 = wx.StaticText(id=ID_DATATYPEEDITORSTATICTEXT5,
               label='Initial Value:', name='staticText5', parent=self.SubrangePanel,
@@ -440,10 +440,10 @@
               label='Initial Value:', name='staticText8', parent=self.EnumeratedPanel,
               pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
 
-        self.EnumeratedInitialValue = wx.Choice(id=ID_DATATYPEEDITORENUMERATEDINITIALVALUE, 
+        self.EnumeratedInitialValue = wx.ComboBox(id=ID_DATATYPEEDITORENUMERATEDINITIALVALUE, 
               name='EnumeratedInitialValue', parent=self.EnumeratedPanel, pos=wx.Point(0, 0),
-              size=wx.Size(0, 24), style=wx.TAB_TRAVERSAL|wx.TE_PROCESS_ENTER)
-        self.Bind(wx.EVT_CHOICE, self.OnInfosChanged, id=ID_DATATYPEEDITORENUMERATEDINITIALVALUE)
+              size=wx.Size(0, 24), style=wx.CB_READONLY)
+        self.Bind(wx.EVT_COMBOBOX, self.OnInfosChanged, id=ID_DATATYPEEDITORENUMERATEDINITIALVALUE)
         
         # Panel for Array data types
 
@@ -455,10 +455,10 @@
               label='Base Type:', name='staticText9', parent=self.ArrayPanel,
               pos=wx.Point(0, 0), size=wx.Size(150, 17), style=0)
 
-        self.ArrayBaseType = wx.Choice(id=ID_DATATYPEEDITORARRAYBASETYPE, 
+        self.ArrayBaseType = wx.ComboBox(id=ID_DATATYPEEDITORARRAYBASETYPE, 
               name='SubrangeBaseType', parent=self.ArrayPanel, pos=wx.Point(0, 0),
-              size=wx.Size(0, 24), style=wx.TAB_TRAVERSAL)
-        self.Bind(wx.EVT_CHOICE, self.OnInfosChanged, id=ID_DATATYPEEDITORARRAYBASETYPE)
+              size=wx.Size(0, 24), style=wx.CB_READONLY)
+        self.Bind(wx.EVT_COMBOBOX, self.OnInfosChanged, id=ID_DATATYPEEDITORARRAYBASETYPE)
 
         self.ArrayDimensions = wx.gizmos.EditableListBox(id=ID_DATATYPEEDITORARRAYDIMENSIONS, 
               name='ArrayDimensions', parent=self.ArrayPanel, label="Dimensions:", pos=wx.Point(0, 0),
--- a/Dialogs.py	Wed Jan 14 19:47:06 2009 +0100
+++ b/Dialogs.py	Fri Jan 16 13:22:07 2009 +0100
@@ -504,10 +504,10 @@
               label='Preview:', name='staticText5', parent=self,
               pos=wx.Point(0, 0), size=wx.Size(0, 17), style=0)
 
-        self.Class = wx.Choice(id=ID_VARIABLEPROPERTIESDIALOGCLASS,
+        self.Class = wx.ComboBox(id=ID_VARIABLEPROPERTIESDIALOGCLASS,
               name='Class', parent=self, pos=wx.Point(0, 0),
-              size=wx.Size(0, 24), style=0)
-        self.Bind(wx.EVT_CHOICE, self.OnClassChanged, id=ID_VARIABLEPROPERTIESDIALOGCLASS)
+              size=wx.Size(0, 24), style=wx.CB_READONLY)
+        self.Bind(wx.EVT_COMBOBOX, self.OnClassChanged, id=ID_VARIABLEPROPERTIESDIALOGCLASS)
         
         self.VariableName = wx.ListBox(id=ID_VARIABLEPROPERTIESDIALOGNAME,
               name='Name', parent=self, pos=wx.Point(0, 0),
@@ -1012,10 +1012,10 @@
               pos=wx.Point(0, 0), size=wx.Size(0, 24), style=0)
         self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, id=ID_LDELEMENTDIALOGRADIOBUTTON6)
 
-        self.ElementName = wx.Choice(id=ID_LDELEMENTDIALOGNAME,
+        self.ElementName = wx.ComboBox(id=ID_LDELEMENTDIALOGNAME,
               name='Name', parent=self, pos=wx.Point(0, 0),
-              size=wx.Size(0, 24), style=0)
-        self.Bind(wx.EVT_CHOICE, self.OnNameChanged, id=ID_LDELEMENTDIALOGNAME)
+              size=wx.Size(0, 24), style=wx.CB_READONLY)
+        self.Bind(wx.EVT_COMBOBOX, self.OnNameChanged, id=ID_LDELEMENTDIALOGNAME)
 
         self.Preview = wx.Panel(id=ID_LDELEMENTDIALOGPREVIEW,
               name='Preview', parent=self, pos=wx.Point(0, 0),
@@ -1667,10 +1667,10 @@
         self.Bind(wx.EVT_RADIOBUTTON, self.OnTypeChanged, id=ID_TRANSITIONCONTENTDIALOGRADIOBUTTON1)
         self.radioButton1.SetValue(True)
 
-        self.Reference = wx.Choice(id=ID_TRANSITIONCONTENTDIALOGREFERENCE,
+        self.Reference = wx.ComboBox(id=ID_TRANSITIONCONTENTDIALOGREFERENCE,
               name='Reference', parent=self, pos=wx.Point(0, 0), 
-              size=wx.Size(0, 24), style=0)
-        self.Bind(wx.EVT_CHOICE, self.OnReferenceChanged, id=ID_TRANSITIONCONTENTDIALOGREFERENCE)
+              size=wx.Size(0, 24), style=wx.CB_READONLY)
+        self.Bind(wx.EVT_COMBOBOX, self.OnReferenceChanged, id=ID_TRANSITIONCONTENTDIALOGREFERENCE)
 
         self.radioButton2 = wx.RadioButton(id=ID_TRANSITIONCONTENTDIALOGRADIOBUTTON2,
               label='Inline', name='radioButton2', parent=self,
--- 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),