diff -r b4583cb86f18 -r 2df3d31d8059 DataTypeEditor.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),