--- a/Viewer.py	Thu Aug 21 15:44:42 2008 +0200
+++ b/Viewer.py	Fri Aug 22 13:49:22 2008 +0200
@@ -168,24 +168,7 @@
             message = wx.MessageDialog(self.ParentWindow, message, "Error", wx.OK|wx.ICON_ERROR)
             message.ShowModal()
             message.Destroy()
-   
-if wx.VERSION >= (2, 8, 0):
-    import wx.aui
-
-    class MDIViewer(wx.aui.AuiMDIChildFrame):
-        def __init__(self, parent, tagname, window, controler):
-            wx.aui.AuiMDIChildFrame.__init__(self, parent, -1, title = "")
-            
-            sizer = wx.BoxSizer(wx.HORIZONTAL)
-            
-            self.Viewer = Viewer(self, tagname, window, controler)
-            
-            sizer.AddWindow(self.Viewer, 1, border=0, flag=wx.GROW)
-            
-            self.SetSizer(sizer)
-        
-        def GetViewer(self):
-            return self.Viewer
+
 
 """
 Class that implements a Viewer based on a wx.ScrolledWindow for drawing and 
@@ -916,13 +899,13 @@
                 self.ContextualMenu.Check(ID_VIEWERCONTEXTUALMENUITEMS0, True)
         self.PopupMenu(self.ContextualMenu)
     
-    def PopupWireMenu(self):
+    def PopupWireMenu(self, delete=True):
         self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS0, False)
         self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS1, False)
         self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS2, False)
         self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS3, False)
         self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS5, True)
-        self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS6, True)
+        self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS6, delete)
         self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS8, False)
         self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS9, False)
         self.ContextualMenu.Enable(ID_VIEWERCONTEXTUALMENUITEMS14, False)