# HG changeset patch
# User Edouard Tisserant
# Date 1635241263 -7200
# Node ID 78add3f69e39a678dce0ae6e7cc940006a65cb1a
# Parent  e5cb7447320c6aa4c50b02bb8a96a014c9eeb2dc# Parent  3c31dce1a661ee958061c85381b2e29f9264c1d1
merged

diff -r e5cb7447320c -r 78add3f69e39 BeremizIDE.py
--- a/BeremizIDE.py	Thu Oct 21 09:45:21 2021 +0200
+++ b/BeremizIDE.py	Tue Oct 26 11:41:03 2021 +0200
@@ -252,7 +252,7 @@
                    kind=wx.ITEM_NORMAL, text=_(u'Open') + '\tCTRL+O')
         parent.AppendMenu(ID_FILEMENURECENTPROJECTS, _("&Recent Projects"), self.RecentProjectsMenu)
         parent.AppendSeparator()
-        parent.Append(wx.ID_ANY, _("&Tutorials and Examples"), self.TutorialsProjectsMenu)
+        parent.AppendMenu(wx.ID_ANY, _("&Tutorials and Examples"), self.TutorialsProjectsMenu)
 
         exemples_dir = Bpath("exemples")
         project_list = sorted(os.listdir(exemples_dir))
diff -r e5cb7447320c -r 78add3f69e39 opc_ua/opcua_client_maker.py
--- a/opc_ua/opcua_client_maker.py	Thu Oct 21 09:45:21 2021 +0200
+++ b/opc_ua/opcua_client_maker.py	Tue Oct 26 11:41:03 2021 +0200
@@ -7,7 +7,7 @@
 from opcua import ua
 
 import wx
-import wx.lib.gizmos as gizmos  # Formerly wx.gizmos in Classic
+from wx.lib.agw.hypertreelist import HyperTreeList as TreeListCtrl
 import wx.dataview as dv
 
 
@@ -38,9 +38,9 @@
 
 directions = ["input", "output"]
 
-class OPCUASubListModel(dv.DataViewIndexListModel):
+class OPCUASubListModel(dv.PyDataViewIndexListModel):
     def __init__(self, data, log):
-        dv.DataViewIndexListModel.__init__(self, len(data))
+        dv.PyDataViewIndexListModel.__init__(self, len(data))
         self.data = data
         self.log = log
 
@@ -310,10 +310,10 @@
             self.tree_sizer.AddGrowableCol(0)
             self.tree_sizer.AddGrowableRow(0)
 
-            self.tree = gizmos.TreeListCtrl(self.tree_panel, -1, style=0, agwStyle=
-                                            gizmos.TR_DEFAULT_STYLE
-                                            | gizmos.TR_MULTIPLE
-                                            | gizmos.TR_FULL_ROW_HIGHLIGHT
+            self.tree = TreeListCtrl(self.tree_panel, -1, style=0, agwStyle=
+                                            wx.TR_DEFAULT_STYLE
+                                            | wx.TR_MULTIPLE
+                                            | wx.TR_FULL_ROW_HIGHLIGHT
                                        )
 
             prepare_image_list()