# HG changeset patch
# User Laurent Bessard
# Date 1354718561 -3600
# Node ID 504ce1e3e94af23e8761fc3e706b424b29978841
# Parent  4b60a0d313b07e460571331e5ac06ae30c8491fb# Parent  71623bbf80937770031cc6efabc9678cd47315ab
Merged

diff -r 71623bbf8093 -r 504ce1e3e94a objdictgen/commondialogs.py
--- a/objdictgen/commondialogs.py	Sat Oct 20 10:17:29 2012 +0200
+++ b/objdictgen/commondialogs.py	Wed Dec 05 15:42:41 2012 +0100
@@ -482,7 +482,7 @@
         self.Type = wx.ComboBox(choices=[], id=ID_USERTYPEDIALOGTYPE,
               name='Type', parent=self, pos=wx.Point(0, 0),
               size=wx.Size(0, 28), style=wx.CB_READONLY)
-        self.Type.Bind(wx.EVT_CHOICE, self.OnTypeChoice,
+        self.Type.Bind(wx.wx.EVT_COMBOBOX, self.OnTypeChoice,
               id=ID_USERTYPEDIALOGTYPE)
 
         self.Spacer = wx.Panel(id=ID_MAPVARIABLEDIALOGSPACER,
@@ -924,7 +924,7 @@
         self.Profile = wx.ComboBox(choices=[], id=ID_CREATENODEDIALOGPROFILE,
               name='Profile', parent=self, pos=wx.Point(0, 0),
               size=wx.Size(0, 28), style=wx.CB_READONLY)
-        self.Profile.Bind(wx.EVT_CHOICE, self.OnProfileChoice,
+        self.Profile.Bind(wx.EVT_COMBOBOX, self.OnProfileChoice,
               id=ID_CREATENODEDIALOGPROFILE)
 
         self.staticText5 = wx.StaticText(id=ID_CREATENODEDIALOGSTATICTEXT5,
diff -r 71623bbf8093 -r 504ce1e3e94a objdictgen/nodemanager.py
--- a/objdictgen/nodemanager.py	Sat Oct 20 10:17:29 2012 +0200
+++ b/objdictgen/nodemanager.py	Wed Dec 05 15:42:41 2012 +0100
@@ -1055,7 +1055,7 @@
                 else:
                     if infos["user_defined"]:
                         if entry_infos["struct"] & OD_IdenticalSubindexes:
-                            if i == 0:
+                            if i == 1:
                                 editor["type"] = "type"
                                 editor["access"] = "access"
                         else:
diff -r 71623bbf8093 -r 504ce1e3e94a objdictgen/subindextable.py
--- a/objdictgen/subindextable.py	Sat Oct 20 10:17:29 2012 +0200
+++ b/objdictgen/subindextable.py	Wed Dec 05 15:42:41 2012 +0100
@@ -561,6 +561,7 @@
                             dragSource = wx.DropSource(self.SubindexGrid)
                             dragSource.SetData(data)
                             dragSource.DoDragDrop()
+                            return
             elif col == 0:
                 selected = self.IndexList.GetSelection()
                 node_id = self.ParentWindow.GetCurrentNodeId()
@@ -583,6 +584,7 @@
                             dragSource = wx.DropSource(self.SubindexGrid)
                             dragSource.SetData(data)
                             dragSource.DoDragDrop()
+                            return
         event.Skip()
 
     def OnAddButtonClick(self, event):