Patch 1678304

[wxWidgets.git] / wxPython / demo / TreeMixin.py

diff --git a/wxPython/demo/TreeMixin.py b/wxPython/demo/TreeMixin.py
index 8a3245571b5d4d2af3152ba9f3120b454160a963..7c31599a3f6238b968eb40307c91d5c729290efd 100644 (file)
--- a/wxPython/demo/TreeMixin.py
+++ b/wxPython/demo/TreeMixin.py
@@ -1,10 +1,6 @@
 import wx, wx.lib.customtreectrl, wx.gizmos
 import wx, wx.lib.customtreectrl, wx.gizmos

-try:
-    import treemixin 
-except ImportError:
-    from wx.lib.mixins import treemixin
+import treemixin

 
 

-overview = treemixin.__doc__

 
 class TreeModel(object):
     ''' TreeModel holds the domain objects that are shown in the different
 
 class TreeModel(object):
     ''' TreeModel holds the domain objects that are shown in the different


@@ -153,8 +149,8 @@ class VirtualCustomTreeCtrl(DemoTreeMixin,
                             wx.lib.customtreectrl.CustomTreeCtrl):
     def __init__(self, *args, **kwargs):
         self.checked = {}
                             wx.lib.customtreectrl.CustomTreeCtrl):
     def __init__(self, *args, **kwargs):
         self.checked = {}

-        kwargs['ctstyle'] = wx.TR_DEFAULT_STYLE | wx.TR_HIDE_ROOT | \
-                            wx.TR_HAS_BUTTONS | wx.TR_FULL_ROW_HIGHLIGHT
+        kwargs['style'] = wx.TR_HIDE_ROOT | \
+            wx.TR_HAS_BUTTONS | wx.TR_FULL_ROW_HIGHLIGHT

         super(VirtualCustomTreeCtrl, self).__init__(*args, **kwargs)
         self.Bind(wx.lib.customtreectrl.EVT_TREE_ITEM_CHECKED,
                   self.OnItemChecked)
         super(VirtualCustomTreeCtrl, self).__init__(*args, **kwargs)
         self.Bind(wx.lib.customtreectrl.EVT_TREE_ITEM_CHECKED,
                   self.OnItemChecked)