X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1fded56b375bf7a4687af1cdb182899614c1b2a8..68ff6404bb8ea57371214a6c8a416cf8a4a31453:/wxPython/demo/XMLtreeview.py diff --git a/wxPython/demo/XMLtreeview.py b/wxPython/demo/XMLtreeview.py index 081ac5f0f6..113360e2d2 100644 --- a/wxPython/demo/XMLtreeview.py +++ b/wxPython/demo/XMLtreeview.py @@ -1,9 +1,9 @@ -import sys +import sys +import wx py2 = sys.version[0] == '2' -from wxPython.wx import * try: if py2: from xml.parsers import expat @@ -19,30 +19,34 @@ except ImportError: if not haveXML: def runTest(frame, nb, log): - dlg = wxMessageDialog(frame, 'This demo requires the XML package. ' - 'See http://www.python.org/sigs/xml-sig/', - 'Sorry', wxOK | wxICON_INFORMATION) + dlg = wx.MessageDialog( + frame, 'This demo requires the XML package. ' + 'See http://www.python.org/sigs/xml-sig/', + 'Sorry', wx.OK | wx.ICON_INFORMATION + ) + dlg.ShowModal() dlg.Destroy() else: - class XMLTree(wxTreeCtrl): + class XMLTree(wx.TreeCtrl): def __init__(self, parent, ID): - wxTreeCtrl.__init__(self, parent, ID) + wx.TreeCtrl.__init__(self, parent, ID) self.nodeStack = [self.AddRoot("Root")] # Trees need an image list to do DnD... - self.il = wxImageList(16,16) + self.il = wx.ImageList(16,16) self.SetImageList(self.il) # event handlers for DnD - EVT_TREE_BEGIN_DRAG(self, ID, self.OnBeginDrag) - EVT_TREE_END_DRAG(self, ID, self.OnEndDrag) + self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.OnBeginDrag) + self.Bind(wx.EVT_TREE_END_DRAG, self.OnEndDrag) def OnBeginDrag(self, event): item = event.GetItem() + if item != self.GetRootItem(): self.draggingItem = item event.Allow() # if DnD of this item is okay Allow it. @@ -69,6 +73,7 @@ else: def StartElement(self, name, attrs ): if py2: name = name.encode() + id = self.AppendItem(self.nodeStack[-1], name) self.nodeStack.append(id) @@ -79,6 +84,7 @@ else: if data.strip(): if py2: data = data.encode() + self.AppendItem(self.nodeStack[-1], data) @@ -104,17 +110,11 @@ else: - - - overview = """\ """ - - - if __name__ == '__main__': import sys,os import run - run.main(['', os.path.basename(sys.argv[0])]) + run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])