Allow AutoCompletion for items in collections too

[wxWidgets.git] / wxPython / wx / tools / XRCed / tree.py

diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py
index 4c6817b53590f0684ecec292f2856a18855dfc6b..3fb095bcec2d2ca3ac9e1b2881a12deec6a6b71f 100644 (file)
--- a/wxPython/wx/tools/XRCed/tree.py
+++ b/wxPython/wx/tools/XRCed/tree.py
@@ -22,14 +22,14 @@ class MemoryFile:
         if g.currentEncoding:
             encoding = g.currentEncoding
         else:
         if g.currentEncoding:
             encoding = g.currentEncoding
         else:

-            encoding = wxGetDefaultPyEncoding()
+            encoding = wx.GetDefaultPyEncoding()

         try:
             self.buffer += data.encode(encoding)
         except UnicodeEncodeError:
             self.buffer += data.encode(encoding, 'xmlcharrefreplace')
             
     def close(self):
         try:
             self.buffer += data.encode(encoding)
         except UnicodeEncodeError:
             self.buffer += data.encode(encoding, 'xmlcharrefreplace')
             
     def close(self):

-        wxMemoryFSHandler_AddFile(self.name, self.buffer)
+        wx.MemoryFSHandler.AddFile(self.name, self.buffer)

 
 ################################################################################
 
 
 ################################################################################
 


@@ -49,97 +49,103 @@ class MyDocument(minidom.Document):
 
 # Ids for menu commands
 class ID_NEW:
 
 # Ids for menu commands
 class ID_NEW:

-    PANEL = wxNewId()
-    DIALOG = wxNewId()
-    FRAME = wxNewId()
-    TOOL_BAR = wxNewId()
-    TOOL = wxNewId()
-    MENU_BAR = wxNewId()
-    MENU = wxNewId()
-
-    STATIC_TEXT = wxNewId()
-    TEXT_CTRL = wxNewId()
-
-    BUTTON = wxNewId()
-    BITMAP_BUTTON = wxNewId()
-    RADIO_BUTTON = wxNewId()
-    SPIN_BUTTON = wxNewId()
-    TOGGLE_BUTTON = wxNewId()
-
-    STATIC_BOX = wxNewId()
-    CHECK_BOX = wxNewId()
-    RADIO_BOX = wxNewId()
-    COMBO_BOX = wxNewId()
-    LIST_BOX = wxNewId()
-
-    STATIC_LINE = wxNewId()
-    STATIC_BITMAP = wxNewId()
-    CHOICE = wxNewId()
-    SLIDER = wxNewId()
-    GAUGE = wxNewId()
-    SCROLL_BAR = wxNewId()
-    TREE_CTRL = wxNewId()
-    LIST_CTRL = wxNewId()
-    CHECK_LIST = wxNewId()
-    NOTEBOOK = wxNewId()
-    SPLITTER_WINDOW = wxNewId()
-    SCROLLED_WINDOW = wxNewId()
-    HTML_WINDOW = wxNewId()
-    CALENDAR_CTRL = wxNewId()
-    GENERIC_DIR_CTRL = wxNewId()
-    SPIN_CTRL = wxNewId()
-    UNKNOWN = wxNewId()
-    WIZARD = wxNewId()
-    WIZARD_PAGE = wxNewId()
-    WIZARD_PAGE_SIMPLE = wxNewId()
-    STATUS_BAR = wxNewId()
-
-    BOX_SIZER = wxNewId()
-    STATIC_BOX_SIZER = wxNewId()
-    GRID_SIZER = wxNewId()
-    FLEX_GRID_SIZER = wxNewId()
-    GRID_BAG_SIZER = wxNewId()
-    STD_DIALOG_BUTTON_SIZER = wxNewId()
-    SPACER = wxNewId()
+    PANEL = wx.NewId()
+    DIALOG = wx.NewId()
+    FRAME = wx.NewId()
+    TOOL_BAR = wx.NewId()
+    TOOL = wx.NewId()
+    MENU_BAR = wx.NewId()
+    MENU = wx.NewId()
+    STATUS_BAR = wx.NewId()
+
+    STATIC_TEXT = wx.NewId()
+    TEXT_CTRL = wx.NewId()
+
+    BUTTON = wx.NewId()
+    BITMAP_BUTTON = wx.NewId()
+    RADIO_BUTTON = wx.NewId()
+    SPIN_BUTTON = wx.NewId()
+    TOGGLE_BUTTON = wx.NewId()
+
+    STATIC_BOX = wx.NewId()
+    CHECK_BOX = wx.NewId()
+    RADIO_BOX = wx.NewId()
+    COMBO_BOX = wx.NewId()
+    LIST_BOX = wx.NewId()
+
+    STATIC_LINE = wx.NewId()
+    STATIC_BITMAP = wx.NewId()
+    CHOICE = wx.NewId()
+    SLIDER = wx.NewId()
+    GAUGE = wx.NewId()
+    SCROLL_BAR = wx.NewId()
+    TREE_CTRL = wx.NewId()
+    LIST_CTRL = wx.NewId()
+    CHECK_LIST = wx.NewId()
+    NOTEBOOK = wx.NewId()
+    CHOICEBOOK = wx.NewId()
+    LISTBOOK = wx.NewId()
+    SPLITTER_WINDOW = wx.NewId()
+    SCROLLED_WINDOW = wx.NewId()
+    HTML_WINDOW = wx.NewId()
+    CALENDAR_CTRL = wx.NewId()
+    DATE_CTRL = wx.NewId()
+    GENERIC_DIR_CTRL = wx.NewId()
+    SPIN_CTRL = wx.NewId()
+    UNKNOWN = wx.NewId()
+    WIZARD = wx.NewId()
+    WIZARD_PAGE = wx.NewId()
+    WIZARD_PAGE_SIMPLE = wx.NewId()
+    BITMAP = wx.NewId()
+    ICON = wx.NewId()
+    STATUS_BAR = wx.NewId()
+
+    BOX_SIZER = wx.NewId()
+    STATIC_BOX_SIZER = wx.NewId()
+    GRID_SIZER = wx.NewId()
+    FLEX_GRID_SIZER = wx.NewId()
+    GRID_BAG_SIZER = wx.NewId()
+    STD_DIALOG_BUTTON_SIZER = wx.NewId()
+    SPACER = wx.NewId()

     
     

-    TOOL_BAR = wxNewId()
-    TOOL = wxNewId()
-    MENU = wxNewId()
-    MENU_ITEM = wxNewId()
-    SEPARATOR = wxNewId()
+    TOOL_BAR = wx.NewId()
+    TOOL = wx.NewId()
+    MENU = wx.NewId()
+    MENU_ITEM = wx.NewId()
+    SEPARATOR = wx.NewId()

 
 

-    OK_BUTTON = wxNewId()
-    YES_BUTTON = wxNewId()
-    SAVE_BUTTON = wxNewId()
-    APPLY_BUTTON = wxNewId()
-    NO_BUTTON = wxNewId()
-    CANCEL_BUTTON = wxNewId()
-    HELP_BUTTON = wxNewId()
-    CONTEXT_HELP_BUTTON = wxNewId()
+    OK_BUTTON = wx.NewId()
+    YES_BUTTON = wx.NewId()
+    SAVE_BUTTON = wx.NewId()
+    APPLY_BUTTON = wx.NewId()
+    NO_BUTTON = wx.NewId()
+    CANCEL_BUTTON = wx.NewId()
+    HELP_BUTTON = wx.NewId()
+    CONTEXT_HELP_BUTTON = wx.NewId()

 
 

-    REF = wxNewId()
+    REF = wx.NewId()

 
 

-    LAST = wxNewId()
+    LAST = wx.NewId()

 
     
 
 class PullDownMenu:
 
     
 
 class PullDownMenu:

-    ID_EXPAND = wxNewId()
-    ID_COLLAPSE = wxNewId()
-    ID_PASTE_SIBLING = wxNewId()
-    ID_TOOL_PASTE = wxNewId()
-    ID_SUBCLASS = wxNewId()
+    ID_EXPAND = wx.NewId()
+    ID_COLLAPSE = wx.NewId()
+    ID_PASTE_SIBLING = wx.NewId()
+    ID_TOOL_PASTE = wx.NewId()
+    ID_SUBCLASS = wx.NewId()

 
     def __init__(self, parent):
         self.ID_DELETE = parent.ID_DELETE
 
     def __init__(self, parent):
         self.ID_DELETE = parent.ID_DELETE

-        EVT_MENU_RANGE(parent, ID_NEW.PANEL, ID_NEW.LAST, parent.OnCreate)
-        EVT_MENU_RANGE(parent, 1000 + ID_NEW.PANEL, 1000 + ID_NEW.LAST, parent.OnReplace)
-        EVT_MENU(parent, self.ID_COLLAPSE, parent.OnCollapse)
-        EVT_MENU(parent, self.ID_EXPAND, parent.OnExpand)
-        EVT_MENU(parent, self.ID_PASTE_SIBLING, parent.OnPaste)
-        EVT_MENU(parent, self.ID_SUBCLASS, parent.OnSubclass)
+        wx.EVT_MENU_RANGE(parent, ID_NEW.PANEL, ID_NEW.LAST, parent.OnCreate)
+        wx.EVT_MENU_RANGE(parent, 1000 + ID_NEW.PANEL, 1000 + ID_NEW.LAST, parent.OnReplace)
+        wx.EVT_MENU(parent, self.ID_COLLAPSE, parent.OnCollapse)
+        wx.EVT_MENU(parent, self.ID_EXPAND, parent.OnExpand)
+        wx.EVT_MENU(parent, self.ID_PASTE_SIBLING, parent.OnPaste)
+        wx.EVT_MENU(parent, self.ID_SUBCLASS, parent.OnSubclass)

         # We connect to tree, but process in frame
         # We connect to tree, but process in frame

-        EVT_MENU_HIGHLIGHT_ALL(g.tree, parent.OnPullDownHighlight)
+        wx.EVT_MENU_HIGHLIGHT_ALL(g.tree, parent.OnPullDownHighlight)

 
         # Mapping from IDs to element names
         self.createMap = {
 
         # Mapping from IDs to element names
         self.createMap = {


@@ -151,9 +157,12 @@ class PullDownMenu:
             ID_NEW.WIZARD_PAGE_SIMPLE: 'wxWizardPageSimple',
             ID_NEW.TOOL_BAR: 'wxToolBar',
             ID_NEW.TOOL: 'tool',
             ID_NEW.WIZARD_PAGE_SIMPLE: 'wxWizardPageSimple',
             ID_NEW.TOOL_BAR: 'wxToolBar',
             ID_NEW.TOOL: 'tool',

+            ID_NEW.STATUS_BAR: 'wxStatusBar',

             ID_NEW.MENU_BAR: 'wxMenuBar',
             ID_NEW.MENU: 'wxMenu',
             ID_NEW.MENU_ITEM: 'wxMenuItem',
             ID_NEW.MENU_BAR: 'wxMenuBar',
             ID_NEW.MENU: 'wxMenu',
             ID_NEW.MENU_ITEM: 'wxMenuItem',

+            ID_NEW.BITMAP: 'wxBitmap',
+            ID_NEW.ICON: 'wxIcon',

             ID_NEW.SEPARATOR: 'separator',
 
             ID_NEW.STATIC_TEXT: 'wxStaticText',
             ID_NEW.SEPARATOR: 'separator',
 
             ID_NEW.STATIC_TEXT: 'wxStaticText',


@@ -170,6 +179,7 @@ class PullDownMenu:
             ID_NEW.RADIO_BOX: 'wxRadioBox',
             ID_NEW.COMBO_BOX: 'wxComboBox',
             ID_NEW.LIST_BOX: 'wxListBox',
             ID_NEW.RADIO_BOX: 'wxRadioBox',
             ID_NEW.COMBO_BOX: 'wxComboBox',
             ID_NEW.LIST_BOX: 'wxListBox',

+            ID_NEW.CHECK_LIST: 'wxCheckListBox',

 
             ID_NEW.STATIC_LINE: 'wxStaticLine',
             ID_NEW.STATIC_BITMAP: 'wxStaticBitmap',
 
             ID_NEW.STATIC_LINE: 'wxStaticLine',
             ID_NEW.STATIC_BITMAP: 'wxStaticBitmap',


@@ -179,12 +189,14 @@ class PullDownMenu:
             ID_NEW.SCROLL_BAR: 'wxScrollBar',
             ID_NEW.TREE_CTRL: 'wxTreeCtrl',
             ID_NEW.LIST_CTRL: 'wxListCtrl',
             ID_NEW.SCROLL_BAR: 'wxScrollBar',
             ID_NEW.TREE_CTRL: 'wxTreeCtrl',
             ID_NEW.LIST_CTRL: 'wxListCtrl',

-            ID_NEW.CHECK_LIST: 'wxCheckListBox',

             ID_NEW.NOTEBOOK: 'wxNotebook',
             ID_NEW.NOTEBOOK: 'wxNotebook',

+            ID_NEW.CHOICEBOOK: 'wxChoicebook',
+            ID_NEW.LISTBOOK: 'wxListbook',

             ID_NEW.SPLITTER_WINDOW: 'wxSplitterWindow',
             ID_NEW.SCROLLED_WINDOW: 'wxScrolledWindow',
             ID_NEW.HTML_WINDOW: 'wxHtmlWindow',
             ID_NEW.CALENDAR_CTRL: 'wxCalendarCtrl',
             ID_NEW.SPLITTER_WINDOW: 'wxSplitterWindow',
             ID_NEW.SCROLLED_WINDOW: 'wxScrolledWindow',
             ID_NEW.HTML_WINDOW: 'wxHtmlWindow',
             ID_NEW.CALENDAR_CTRL: 'wxCalendarCtrl',

+            ID_NEW.DATE_CTRL: 'wxDatePickerCtrl',

             ID_NEW.GENERIC_DIR_CTRL: 'wxGenericDirCtrl',
             ID_NEW.SPIN_CTRL: 'wxSpinCtrl',
 
             ID_NEW.GENERIC_DIR_CTRL: 'wxGenericDirCtrl',
             ID_NEW.SPIN_CTRL: 'wxSpinCtrl',
 


@@ -214,13 +226,19 @@ class PullDownMenu:
             None,
             (ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),
             (ID_NEW.MENU_BAR, 'MenuBar', 'Create menubar'),
             None,
             (ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),
             (ID_NEW.MENU_BAR, 'MenuBar', 'Create menubar'),

-            (ID_NEW.MENU, 'Menu', 'Create menu')
+            (ID_NEW.MENU, 'Menu', 'Create menu'),
+            None,
+            (ID_NEW.BITMAP, 'Bitmap', 'Create bitmap'),
+            (ID_NEW.ICON, 'Icon', 'Create icon'),

             ]
         self.containers = [
              (ID_NEW.PANEL, 'Panel', 'Create panel'),
              (ID_NEW.NOTEBOOK, 'Notebook', 'Create notebook control'),
             ]
         self.containers = [
              (ID_NEW.PANEL, 'Panel', 'Create panel'),
              (ID_NEW.NOTEBOOK, 'Notebook', 'Create notebook control'),

+             (ID_NEW.CHOICEBOOK, 'Choicebook', 'Create choicebook control'),
+             (ID_NEW.LISTBOOK, 'Listbook', 'Create listbook control'),

              (ID_NEW.SPLITTER_WINDOW, 'SplitterWindow', 'Create splitter window'),
              (ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),
              (ID_NEW.SPLITTER_WINDOW, 'SplitterWindow', 'Create splitter window'),
              (ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),

+             (ID_NEW.STATUS_BAR, 'StatusBar', 'Create status bar'),

 #             (ID_NEW.WIZARD_PAGE, 'WizardPage', 'Create wizard page'),
              (ID_NEW.WIZARD_PAGE_SIMPLE, 'WizardPageSimple', 'Create simple wizard page'),
             ]
 #             (ID_NEW.WIZARD_PAGE, 'WizardPage', 'Create wizard page'),
              (ID_NEW.WIZARD_PAGE_SIMPLE, 'WizardPageSimple', 'Create simple wizard page'),
             ]


@@ -250,10 +268,10 @@ class PullDownMenu:
              (ID_NEW.SCROLL_BAR, 'ScrollBar', 'Create scroll bar'),
              (ID_NEW.TREE_CTRL, 'TreeCtrl', 'Create tree'),
              (ID_NEW.LIST_CTRL, 'ListCtrl', 'Create list'),
              (ID_NEW.SCROLL_BAR, 'ScrollBar', 'Create scroll bar'),
              (ID_NEW.TREE_CTRL, 'TreeCtrl', 'Create tree'),
              (ID_NEW.LIST_CTRL, 'ListCtrl', 'Create list'),

-             (ID_NEW.CHECK_LIST, 'CheckList', 'Create check list'),

              (ID_NEW.SCROLLED_WINDOW, 'ScrolledWindow', 'Create scrolled window'),
              (ID_NEW.HTML_WINDOW, 'HtmlWindow', 'Create HTML window'),
              (ID_NEW.CALENDAR_CTRL, 'CalendarCtrl', 'Create calendar control'),
              (ID_NEW.SCROLLED_WINDOW, 'ScrolledWindow', 'Create scrolled window'),
              (ID_NEW.HTML_WINDOW, 'HtmlWindow', 'Create HTML window'),
              (ID_NEW.CALENDAR_CTRL, 'CalendarCtrl', 'Create calendar control'),

+             (ID_NEW.DATE_CTRL, 'DatePickerCtrl', 'Create date picker control'),

              (ID_NEW.GENERIC_DIR_CTRL, 'GenericDirCtrl', 'Create generic dir control'),
              (ID_NEW.UNKNOWN, 'Unknown', 'Create custom control placeholder'),
              ],
              (ID_NEW.GENERIC_DIR_CTRL, 'GenericDirCtrl', 'Create generic dir control'),
              (ID_NEW.UNKNOWN, 'Unknown', 'Create custom control placeholder'),
              ],


@@ -270,12 +288,17 @@ class PullDownMenu:
              (ID_NEW.RADIO_BOX, 'RadioBox', 'Create radio box'),
              (ID_NEW.COMBO_BOX, 'ComboBox', 'Create combo box'),
              (ID_NEW.LIST_BOX, 'ListBox', 'Create list box'),
              (ID_NEW.RADIO_BOX, 'RadioBox', 'Create radio box'),
              (ID_NEW.COMBO_BOX, 'ComboBox', 'Create combo box'),
              (ID_NEW.LIST_BOX, 'ListBox', 'Create list box'),

+             (ID_NEW.CHECK_LIST, 'CheckListBox', 'Create checklist box'),

              ],
             ['container', 'Containers',
              (ID_NEW.PANEL, 'Panel', 'Create panel'),
              (ID_NEW.NOTEBOOK, 'Notebook', 'Create notebook control'),
              ],
             ['container', 'Containers',
              (ID_NEW.PANEL, 'Panel', 'Create panel'),
              (ID_NEW.NOTEBOOK, 'Notebook', 'Create notebook control'),

+             (ID_NEW.CHOICEBOOK, 'Choicebook', 'Create choicebook control'),
+             (ID_NEW.LISTBOOK, 'Listbook', 'Create listbook control'),

              (ID_NEW.SPLITTER_WINDOW, 'SplitterWindow', 'Create splitter window'),
              (ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),
              (ID_NEW.SPLITTER_WINDOW, 'SplitterWindow', 'Create splitter window'),
              (ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),

+             (ID_NEW.STATUS_BAR, 'StatusBar', 'Create status bar'),
+             (ID_NEW.MENU_BAR, 'MenuBar', 'Create menubar'),

 #             (ID_NEW.WIZARD_PAGE, 'Wizard Page', 'Create wizard page'),
              (ID_NEW.WIZARD_PAGE_SIMPLE, 'WizardPageSimple', 'Create simple wizard page'),
              ],
 #             (ID_NEW.WIZARD_PAGE, 'Wizard Page', 'Create wizard page'),
              (ID_NEW.WIZARD_PAGE_SIMPLE, 'WizardPageSimple', 'Create simple wizard page'),
              ],


@@ -311,7 +334,6 @@ class PullDownMenu:
              (ID_NEW.GAUGE, 'Gauge', 'Create gauge'),
              (ID_NEW.SCROLL_BAR, 'ScrollBar', 'Create scroll bar'),
              (ID_NEW.LIST_CTRL, 'ListCtrl', 'Create list control'),
              (ID_NEW.GAUGE, 'Gauge', 'Create gauge'),
              (ID_NEW.SCROLL_BAR, 'ScrollBar', 'Create scroll bar'),
              (ID_NEW.LIST_CTRL, 'ListCtrl', 'Create list control'),

-             (ID_NEW.CHECK_LIST, 'CheckList', 'Create check list'),

              ],
             ['button', 'Buttons',
              (ID_NEW.BUTTON, 'Button', 'Create button'),
              ],
             ['button', 'Buttons',
              (ID_NEW.BUTTON, 'Button', 'Create button'),


@@ -325,6 +347,7 @@ class PullDownMenu:
              (ID_NEW.RADIO_BOX, 'RadioBox', 'Create radio box'),
              (ID_NEW.COMBO_BOX, 'ComboBox', 'Create combo box'),
              (ID_NEW.LIST_BOX, 'ListBox', 'Create list box'),
              (ID_NEW.RADIO_BOX, 'RadioBox', 'Create radio box'),
              (ID_NEW.COMBO_BOX, 'ComboBox', 'Create combo box'),
              (ID_NEW.LIST_BOX, 'ListBox', 'Create list box'),

+             (ID_NEW.CHECK_LIST, 'CheckListBox', 'Create checklist box'),

              ],
             ]
         self.stdButtons = [
              ],
             ]
         self.stdButtons = [


@@ -364,9 +387,9 @@ def SetMenu(m, list, shift=False):
             if shift:  l = (1000 + l[0],) + l[1:]
             apply(m.Append, l)
         elif type(l) == types.ListType:
             if shift:  l = (1000 + l[0],) + l[1:]
             apply(m.Append, l)
         elif type(l) == types.ListType:

-            subMenu = wxMenu()
-            SetMenu(subMenu, l[2:])
-            m.AppendMenu(wxNewId(), l[0], subMenu, l[1])
+            subMenu = wx.Menu()
+            SetMenu(subMenu, l[2:], shift)
+            m.AppendMenu(wx.NewId(), l[0], subMenu, l[1])

         else:                           # separator
             m.AppendSeparator()
 
         else:                           # separator
             m.AppendSeparator()
 


@@ -377,14 +400,14 @@ class HighLightBox:
         if size.width == -1: size.width = 0
         if size.height == -1: size.height = 0
         w = g.testWin.panel
         if size.width == -1: size.width = 0
         if size.height == -1: size.height = 0
         w = g.testWin.panel

-        l1 = wxWindow(w, -1, pos, wxSize(size.width, 2))
-        l1.SetBackgroundColour(wxRED)
-        l2 = wxWindow(w, -1, pos, wxSize(2, size.height))
-        l2.SetBackgroundColour(wxRED)
-        l3 = wxWindow(w, -1, wxPoint(pos.x + size.width - 2, pos.y), wxSize(2, size.height))
-        l3.SetBackgroundColour(wxRED)
-        l4 = wxWindow(w, -1, wxPoint(pos.x, pos.y + size.height - 2), wxSize(size.width, 2))
-        l4.SetBackgroundColour(wxRED)
+        l1 = wx.Window(w, -1, pos, wx.Size(size.width, 2))
+        l1.SetBackgroundColour(wx.RED)
+        l2 = wx.Window(w, -1, pos, wx.Size(2, size.height))
+        l2.SetBackgroundColour(wx.RED)
+        l3 = wx.Window(w, -1, wx.Point(pos.x + size.width - 2, pos.y), wx.Size(2, size.height))
+        l3.SetBackgroundColour(wx.RED)
+        l4 = wx.Window(w, -1, wx.Point(pos.x, pos.y + size.height - 2), wx.Size(size.width, 2))
+        l4.SetBackgroundColour(wx.RED)

         self.lines = [l1, l2, l3, l4]
     # Move highlight to a new position
     def Replace(self, pos, size):
         self.lines = [l1, l2, l3, l4]
     # Move highlight to a new position
     def Replace(self, pos, size):


@@ -396,35 +419,36 @@ class HighLightBox:
         self.lines[3].SetDimensions(pos.x, pos.y + size.height - 2, size.width, 2)
     # Remove it
     def Remove(self):
         self.lines[3].SetDimensions(pos.x, pos.y + size.height - 2, size.width, 2)
     # Remove it
     def Remove(self):

-        map(wxWindow.Destroy, self.lines)
+        map(wx.Window.Destroy, self.lines)

         g.testWin.highLight = None
     def Refresh(self):
         g.testWin.highLight = None
     def Refresh(self):

-        map(wxWindow.Refresh, self.lines)
+        map(wx.Window.Refresh, self.lines)

 
 ################################################################################
 
 
 ################################################################################
 

-class XML_Tree(wxTreeCtrl):
+class XML_Tree(wx.TreeCtrl):

     def __init__(self, parent, id):
     def __init__(self, parent, id):

-        wxTreeCtrl.__init__(self, parent, id, style = wxTR_HAS_BUTTONS | wxTR_MULTIPLE)
-        self.SetBackgroundColour(wxColour(224, 248, 224))
+        wx.TreeCtrl.__init__(self, parent, id, style = wx.TR_HAS_BUTTONS | wx.TR_MULTIPLE)
+        self.SetBackgroundColour(wx.Colour(224, 248, 224))

         # Register events
         # Register events

-        EVT_TREE_SEL_CHANGED(self, self.GetId(), self.OnSelChanged)
+        wx.EVT_TREE_SEL_CHANGED(self, self.GetId(), self.OnSelChanged)

         # One works on Linux, another on Windows
         # One works on Linux, another on Windows

-        if wxPlatform == '__WXGTK__':
-            EVT_TREE_ITEM_ACTIVATED(self, self.GetId(), self.OnItemActivated)
+        if wx.Platform == '__WXGTK__':
+            wx.EVT_TREE_ITEM_ACTIVATED(self, self.GetId(), self.OnItemActivated)

         else:
         else:

-            EVT_LEFT_DCLICK(self, self.OnDClick)
-        EVT_RIGHT_DOWN(self, self.OnRightDown)
-        EVT_TREE_ITEM_EXPANDED(self, self.GetId(), self.OnItemExpandedCollapsed)
-        EVT_TREE_ITEM_COLLAPSED(self, self.GetId(), self.OnItemExpandedCollapsed)
+            wx.EVT_LEFT_DCLICK(self, self.OnDClick)
+        wx.EVT_RIGHT_DOWN(self, self.OnRightDown)
+        wx.EVT_TREE_ITEM_EXPANDED(self, self.GetId(), self.OnItemExpandedCollapsed)
+        wx.EVT_TREE_ITEM_COLLAPSED(self, self.GetId(), self.OnItemExpandedCollapsed)

 
         self.selection = None
 
         self.selection = None

+        self.selectionChanging = False

         self.needUpdate = False
         self.pendingHighLight = None
         self.ctrl = self.shift = False
         self.dom = None
         # Create image list
         self.needUpdate = False
         self.pendingHighLight = None
         self.ctrl = self.shift = False
         self.dom = None
         # Create image list

-        il = wxImageList(16, 16, True)
+        il = wx.ImageList(16, 16, True)

         self.rootImage = il.Add(images.getTreeRootImage().Scale(16,16).ConvertToBitmap())
         xxxObject.image = il.Add(images.getTreeDefaultImage().Scale(16,16).ConvertToBitmap())
         xxxPanel.image = il.Add(images.getTreePanelImage().Scale(16,16).ConvertToBitmap())
         self.rootImage = il.Add(images.getTreeRootImage().Scale(16,16).ConvertToBitmap())
         xxxObject.image = il.Add(images.getTreeDefaultImage().Scale(16,16).ConvertToBitmap())
         xxxPanel.image = il.Add(images.getTreePanelImage().Scale(16,16).ConvertToBitmap())


@@ -446,10 +470,10 @@ class XML_Tree(wxTreeCtrl):
         self.SetImageList(il)
 
     def RegisterKeyEvents(self):
         self.SetImageList(il)
 
     def RegisterKeyEvents(self):

-        EVT_KEY_DOWN(self, g.tools.OnKeyDown)
-        EVT_KEY_UP(self, g.tools.OnKeyUp)
-        EVT_ENTER_WINDOW(self, g.tools.OnMouse)
-        EVT_LEAVE_WINDOW(self, g.tools.OnMouse)
+        wx.EVT_KEY_DOWN(self, g.tools.OnKeyDown)
+        wx.EVT_KEY_UP(self, g.tools.OnKeyUp)
+        wx.EVT_ENTER_WINDOW(self, g.tools.OnMouse)
+        wx.EVT_LEAVE_WINDOW(self, g.tools.OnMouse)

 
     def ExpandAll(self, item):
         if self.ItemHasChildren(item):
 
     def ExpandAll(self, item):
         if self.ItemHasChildren(item):


@@ -474,6 +498,8 @@ class XML_Tree(wxTreeCtrl):
 
     # Clear tree
     def Clear(self):
 
     # Clear tree
     def Clear(self):

+        self.selection = None
+        self.UnselectAll()

         self.DeleteAllItems()
         # Add minimal structure
         if self.dom: self.dom.unlink()
         self.DeleteAllItems()
         # Add minimal structure
         if self.dom: self.dom.unlink()


@@ -484,13 +510,16 @@ class XML_Tree(wxTreeCtrl):
         self.dom.appendChild(self.mainNode)
         self.rootObj = xxxMainNode(self.dom)
         self.root = self.AddRoot('XML tree', self.rootImage,
         self.dom.appendChild(self.mainNode)
         self.rootObj = xxxMainNode(self.dom)
         self.root = self.AddRoot('XML tree', self.rootImage,

-                                 data=wxTreeItemData(self.rootObj))
+                                 data=wx.TreeItemData(self.rootObj))

         self.SetItemHasChildren(self.root)
         self.SetItemHasChildren(self.root)

-        self.Unselect()
+        self.testElem = self.dom.createElement('dummy')
+        self.mainNode.appendChild(self.testElem)

         self.Expand(self.root)
 
     # Clear old data and set new
     def SetData(self, dom):
         self.Expand(self.root)
 
     # Clear old data and set new
     def SetData(self, dom):

+        self.selection = None
+        self.UnselectAll()

         self.DeleteAllItems()
         # Add minimal structure
         if self.dom: self.dom.unlink()
         self.DeleteAllItems()
         # Add minimal structure
         if self.dom: self.dom.unlink()


@@ -500,7 +529,7 @@ class XML_Tree(wxTreeCtrl):
         self.mainNode = dom.documentElement
         self.rootObj = xxxMainNode(self.dom)
         self.root = self.AddRoot('XML tree', self.rootImage,
         self.mainNode = dom.documentElement
         self.rootObj = xxxMainNode(self.dom)
         self.root = self.AddRoot('XML tree', self.rootImage,

-                                 data=wxTreeItemData(self.rootObj))
+                                 data=wx.TreeItemData(self.rootObj))

         self.SetItemHasChildren(self.root)
         nodes = self.mainNode.childNodes[:]
         for node in nodes:
         self.SetItemHasChildren(self.root)
         nodes = self.mainNode.childNodes[:]
         for node in nodes:


@@ -509,8 +538,13 @@ class XML_Tree(wxTreeCtrl):
             else:
                 self.mainNode.removeChild(node)
                 node.unlink()
             else:
                 self.mainNode.removeChild(node)
                 node.unlink()

+        if self.mainNode.firstChild:
+            self.testElem = self.dom.createElement('dummy')
+            self.mainNode.insertBefore(self.testElem, self.mainNode.firstChild)
+        else:
+            self.testElem = self.dom.createElement('dummy')
+            self.mainNode.appendChild(self.testElem)

         self.Expand(self.root)
         self.Expand(self.root)

-        self.Unselect()

 
     # Add tree item for given parent item if node is DOM element node with
     # object/object_ref tag. xxxParent is parent xxx object
 
     # Add tree item for given parent item if node is DOM element node with
     # object/object_ref tag. xxxParent is parent xxx object


@@ -525,7 +559,7 @@ class XML_Tree(wxTreeCtrl):
         # Append tree item
         item = self.AppendItem(itemParent, treeObj.treeName(),
                                image=treeObj.treeImage(),
         # Append tree item
         item = self.AppendItem(itemParent, treeObj.treeName(),
                                image=treeObj.treeImage(),

-                               data=wxTreeItemData(xxx))
+                               data=wx.TreeItemData(xxx))

         # Different color for references
         if treeObj.ref:
             self.SetItemTextColour(item, 'DarkGreen')
         # Different color for references
         if treeObj.ref:
             self.SetItemTextColour(item, 'DarkGreen')


@@ -555,7 +589,7 @@ class XML_Tree(wxTreeCtrl):
         else:
             parent.element.appendChild(elem)
             newItem = self.AppendItem(itemParent, xxx.treeName(), image=xxx.treeImage(),
         else:
             parent.element.appendChild(elem)
             newItem = self.AppendItem(itemParent, xxx.treeName(), image=xxx.treeImage(),

-                                      data=wxTreeItemData(xxx))
+                                      data=wx.TreeItemData(xxx))

         # Different color for references
         if xxx.treeObject().ref:  self.SetItemTextColour(newItem, 'DarkGreen')
         # Add children items
         # Different color for references
         if xxx.treeObject().ref:  self.SetItemTextColour(newItem, 'DarkGreen')
         # Add children items


@@ -579,17 +613,18 @@ class XML_Tree(wxTreeCtrl):
     # Find position relative to the top-level window
     def FindNodePos(self, item, obj=None):
         # Root at (0,0)
     # Find position relative to the top-level window
     def FindNodePos(self, item, obj=None):
         # Root at (0,0)

-        if item == g.testWin.item: return wxPoint(0, 0)
+        if item == g.testWin.item: return wx.Point(0, 0)

         itemParent = self.GetItemParent(item)
         itemParent = self.GetItemParent(item)

-        # Select NB page
+        # Select book page

         if not obj: obj = self.FindNodeObject(item)
         if not obj: obj = self.FindNodeObject(item)

-        if self.GetPyData(itemParent).treeObject().__class__ == xxxNotebook:
-            notebook = self.FindNodeObject(itemParent)
+        if self.GetPyData(itemParent).treeObject().__class__ in \
+               [xxxNotebook, xxxChoicebook, xxxListbook]:
+            book = self.FindNodeObject(itemParent)

             # Find position
             # Find position

-            for i in range(notebook.GetPageCount()):
-                if notebook.GetPage(i) == obj:
-                    if notebook.GetSelection() != i:
-                        notebook.SetSelection(i)
+            for i in range(book.GetPageCount()):
+                if book.GetPage(i) == obj:
+                    if book.GetSelection() != i:
+                        book.SetSelection(i)

                         # Remove highlight - otherwise highlight window won't be visible
                         if g.testWin.highLight:
                             g.testWin.highLight.Remove()
                         # Remove highlight - otherwise highlight window won't be visible
                         if g.testWin.highLight:
                             g.testWin.highLight.Remove()


@@ -600,7 +635,7 @@ class XML_Tree(wxTreeCtrl):
             winParent = self.GetItemParent(winParent)
         # Notebook children are layed out in a little strange way
         if self.GetPyData(itemParent).treeObject().__class__ == xxxNotebook:
             winParent = self.GetItemParent(winParent)
         # Notebook children are layed out in a little strange way
         if self.GetPyData(itemParent).treeObject().__class__ == xxxNotebook:

-            parentPos = wxPoint(0,0)
+            parentPos = wx.Point(0,0)

         else:
             parentPos = self.FindNodePos(winParent)
         # Position (-1,-1) is really (0,0)
         else:
             parentPos = self.FindNodePos(winParent)
         # Position (-1,-1) is really (0,0)


@@ -617,10 +652,14 @@ class XML_Tree(wxTreeCtrl):
         xxx = self.GetPyData(item).treeObject()
         parentWin = self.FindNodeObject(itemParent)
         # Top-level sizer? return window's sizer
         xxx = self.GetPyData(item).treeObject()
         parentWin = self.FindNodeObject(itemParent)
         # Top-level sizer? return window's sizer

-        if xxx.isSizer and isinstance(parentWin, wxWindow):
+        if xxx.isSizer and isinstance(parentWin, wx.Window):

             return parentWin.GetSizer()
             return parentWin.GetSizer()

+        elif xxx.__class__ in [xxxMenu, xxxMenuItem, xxxSeparator]:  return None
+        elif xxx.__class__ in [xxxToolBar, xxxMenuBar]:
+            # If it's the main toolbar or menubar, we can't really select it
+            if xxx.parent.__class__ == xxxFrame:  return None

         elif isinstance(xxx.parent, xxxToolBar):
         elif isinstance(xxx.parent, xxxToolBar):

-            # How to get tool from toolbar?
+            # Select complete toolbar

             return parentWin
         elif isinstance(xxx.parent, xxxStdDialogButtonSizer):
             # This sizer returns non-existing children
             return parentWin
         elif isinstance(xxx.parent, xxxStdDialogButtonSizer):
             # This sizer returns non-existing children


@@ -628,20 +667,24 @@ class XML_Tree(wxTreeCtrl):
                 if ch.GetWindow() and ch.GetWindow().GetName() == xxx.name:
                     return ch.GetWindow()
             return None
                 if ch.GetWindow() and ch.GetWindow().GetName() == xxx.name:
                     return ch.GetWindow()
             return None

+        elif xxx.parent.__class__ in [xxxChoicebook, xxxListbook]:
+            # First window is controld
+            return parentWin.GetChildren()[self.ItemIndex(item)+1]

         # Otherwise get parent's object and it's child
         # Otherwise get parent's object and it's child

-        child = parentWin.GetChildren()[self.ItemIndex(item)]
+        child = parentWin.GetChildren()[self.WindowIndex(item)]

         # Return window or sizer for sizer items
         if child.GetClassName() == 'wxSizerItem':
             if child.IsWindow(): child = child.GetWindow()
             elif child.IsSizer():
                 child = child.GetSizer()
         # Return window or sizer for sizer items
         if child.GetClassName() == 'wxSizerItem':
             if child.IsWindow(): child = child.GetWindow()
             elif child.IsSizer():
                 child = child.GetSizer()

-                # Test for notebook sizers
-                if isinstance(child, wxNotebookSizer):
-                    child = child.GetNotebook()

         return child
 
     def OnSelChanged(self, evt):
         return child
 
     def OnSelChanged(self, evt):

-        self.ChangeSelection(evt.GetItem())
+        if self.selectionChanging: return
+        self.selectionChanging = True
+        self.UnselectAll()
+        self.SelectItem(evt.GetItem())
+        self.selectionChanging = False

 
     def ChangeSelection(self, item):
         # Apply changes
 
     def ChangeSelection(self, item):
         # Apply changes


@@ -695,7 +738,9 @@ class XML_Tree(wxTreeCtrl):
             return
         # Get window/sizer object
         obj = self.FindNodeObject(item)
             return
         # Get window/sizer object
         obj = self.FindNodeObject(item)

-        if not obj: return
+        if not obj:
+            if g.testWin.highLight: g.testWin.highLight.Remove()
+            return

         pos = self.FindNodePos(item, obj)
         size = obj.GetSize()
         # Highlight
         pos = self.FindNodePos(item, obj)
         size = obj.GetSize()
         # Highlight


@@ -711,18 +756,29 @@ class XML_Tree(wxTreeCtrl):
         xxx = self.GetPyData(item)
         if g.panel.IsModified():
             self.Apply(xxx, item)       # apply changes
         xxx = self.GetPyData(item)
         if g.panel.IsModified():
             self.Apply(xxx, item)       # apply changes

-        treeObj = xxx.treeObject()
-        if treeObj.className not in ['wxFrame', 'wxPanel', 'wxDialog',
-                                     'wxMenuBar', 'wxToolBar', 'wxWizard',
-                                     'wxWizardPageSimple']:
-            wxLogMessage('No view for this element (yet)')
+        availableViews = ['wxFrame', 'wxPanel', 'wxDialog',  
+                          'wxMenuBar', 'wxToolBar', 'wxWizard',  
+                          'wxWizardPageSimple']
+        originalItem = item
+        # Walk up the tree until we find an item that has a view
+        while item and self.GetPyData(item).treeObject().className not in availableViews:
+            item = self.GetItemParent(item)
+        if not item or not item.IsOk():
+            wx.LogMessage('No view for this element (yet)')

             return
         # Show item in bold
         if g.testWin:     # Reset old
             self.SetItemBold(g.testWin.item, False)
             return
         # Show item in bold
         if g.testWin:     # Reset old
             self.SetItemBold(g.testWin.item, False)

-        self.CreateTestWin(item)
+        try:
+            wx.BeginBusyCursor()
+            self.CreateTestWin(item)
+        finally:
+            wx.EndBusyCursor()

         # Maybe an error occurred, so we need to test
         # Maybe an error occurred, so we need to test

-        if g.testWin: self.SetItemBold(g.testWin.item)
+        if g.testWin:
+            self.SetItemBold(g.testWin.item)
+            # Select original item
+            self.ChangeSelection(originalItem)

 
     # Double-click on Linux
     def OnItemActivated(self, evt):
 
     # Double-click on Linux
     def OnItemActivated(self, evt):


@@ -732,7 +788,7 @@ class XML_Tree(wxTreeCtrl):
     # Double-click on Windows
     def OnDClick(self, evt):
         item, flags = self.HitTest(evt.GetPosition())
     # Double-click on Windows
     def OnDClick(self, evt):
         item, flags = self.HitTest(evt.GetPosition())

-        if flags in [wxTREE_HITTEST_ONITEMBUTTON, wxTREE_HITTEST_ONITEMLABEL]:
+        if flags in [wx.TREE_HITTEST_ONITEMBUTTON, wx.TREE_HITTEST_ONITEMLABEL]:

             if item != self.root: self.ShowTestWindow(item)
         else:
             evt.Skip()
             if item != self.root: self.ShowTestWindow(item)
         else:
             evt.Skip()


@@ -755,13 +811,11 @@ class XML_Tree(wxTreeCtrl):
 #            child = self.GetFirstChild(item)[0]
 #            if child.IsOk() and self.GetPyData(child).__class__ == xxxPanel:
 #                # Clean-up before recursive call or error
 #            child = self.GetFirstChild(item)[0]
 #            if child.IsOk() and self.GetPyData(child).__class__ == xxxPanel:
 #                # Clean-up before recursive call or error

-#                wxMemoryFSHandler_RemoveFile('xxx.xrc')
-#                wxEndBusyCursor()
+#                wx.MemoryFSHandler.RemoveFile('xxx.xrc')
+#                wx.EndBusyCursor()

 #                self.CreateTestWin(child)
 #                return
 
 #                self.CreateTestWin(child)
 #                return
 

-        wxBeginBusyCursor()
-        wxYield()

         # Close old window, remember where it was
         highLight = None
         if testWin:
         # Close old window, remember where it was
         highLight = None
         if testWin:


@@ -787,39 +841,35 @@ class XML_Tree(wxTreeCtrl):
         # Save in memory FS
         memFile = MemoryFile('xxx.xrc')
         # Create memory XML file
         # Save in memory FS
         memFile = MemoryFile('xxx.xrc')
         # Create memory XML file

-        elem = xxx.element
-        # Change window id to _XRCED_T_W. This gives some name for
-        # unnamed windows, and for named gives the possibility to
-        # write sawfish scripts.
+        elem = xxx.element.cloneNode(True)

         if not xxx.name:
             name = 'noname'
         else:
             name = xxx.name
         elem.setAttribute('name', STD_NAME)
         if not xxx.name:
             name = 'noname'
         else:
             name = xxx.name
         elem.setAttribute('name', STD_NAME)

+        oldTestNode = self.testElem
+        self.testElem = elem
+        self.mainNode.replaceChild(elem, oldTestNode)
+        oldTestNode.unlink()

         # Replace wizard page class temporarily
         if xxx.__class__ in [xxxWizardPage, xxxWizardPageSimple]:
             oldCl = elem.getAttribute('class')
             elem.setAttribute('class', 'wxPanel')
         parent = elem.parentNode
         # Replace wizard page class temporarily
         if xxx.__class__ in [xxxWizardPage, xxxWizardPageSimple]:
             oldCl = elem.getAttribute('class')
             elem.setAttribute('class', 'wxPanel')
         parent = elem.parentNode

-        next = elem.nextSibling

         encd = self.rootObj.params['encoding'].value()
         if not encd: encd = None
         encd = self.rootObj.params['encoding'].value()
         if not encd: encd = None

-        self.dom.writexml(open('ttt.xrc','w'), encoding=encd)
-        self.dom.writexml(memFile, encoding=encd)
-        # Put back in place
-        # Remove temporary name or restore changed
-        if not xxx.name:
-            elem.removeAttribute('name')
-        else:
-            elem.setAttribute('name', xxx.name)
-        if xxx.__class__ in [xxxWizardPage, xxxWizardPageSimple]:
-            elem.setAttribute('class', oldCl)            
+        try:
+            self.dom.writexml(memFile, encoding=encd)
+        except:
+            inf = sys.exc_info()
+            wx.LogError(traceback.format_exception(inf[0], inf[1], None)[-1])
+            wx.LogError('Error writing temporary file')

         memFile.close()                 # write to wxMemoryFS
         memFile.close()                 # write to wxMemoryFS

-        xmlFlags = wxXRC_NO_SUBCLASSING
+        xmlFlags = xrc.XRC_NO_SUBCLASSING

         # Use translations if encoding is not specified
         if not g.currentEncoding:
         # Use translations if encoding is not specified
         if not g.currentEncoding:

-            xmlFlags != wxXRC_USE_LOCALE
-        res = wxXmlResource('', xmlFlags)
+            xmlFlags != xrc.XRC_USE_LOCALE
+        res = xrc.XmlResource('', xmlFlags)

         res.Load('memory:xxx.xrc')
         try:
             if xxx.__class__ == xxxFrame:
         res.Load('memory:xxx.xrc')
         try:
             if xxx.__class__ == xxxFrame:


@@ -828,23 +878,23 @@ class XML_Tree(wxTreeCtrl):
     #            child = self.GetFirstChild(item)[0]
     #            if child.IsOk() and self.GetPyData(child).__class__ == xxxPanel:
     #                # Clean-up before recursive call or error
     #            child = self.GetFirstChild(item)[0]
     #            if child.IsOk() and self.GetPyData(child).__class__ == xxxPanel:
     #                # Clean-up before recursive call or error

-    #                wxMemoryFSHandler_RemoveFile('xxx.xrc')
-    #                wxEndBusyCursor()
+    #                wx.MemoryFSHandler.RemoveFile('xxx.xrc')
+    #                wx.EndBusyCursor()

     #                self.CreateTestWin(child)
     #                return
                 # This currently works under GTK, but not under MSW
     #                self.CreateTestWin(child)
     #                return
                 # This currently works under GTK, but not under MSW

-                testWin = g.testWin = wxPreFrame()
+                testWin = g.testWin = wx.PreFrame()

                 res.LoadOnFrame(testWin, g.frame, STD_NAME)
                 # Create status bar
                 testWin.panel = testWin
                 res.LoadOnFrame(testWin, g.frame, STD_NAME)
                 # Create status bar
                 testWin.panel = testWin

-                testWin.CreateStatusBar()
+                #testWin.CreateStatusBar()

                 testWin.SetClientSize(testWin.GetBestSize())
                 testWin.SetPosition(pos)
                 testWin.Show(True)
             elif xxx.__class__ == xxxPanel:
                 # Create new frame
                 if not testWin:
                 testWin.SetClientSize(testWin.GetBestSize())
                 testWin.SetPosition(pos)
                 testWin.Show(True)
             elif xxx.__class__ == xxxPanel:
                 # Create new frame
                 if not testWin:

-                    testWin = g.testWin = wxFrame(g.frame, -1, 'Panel: ' + name,
+                    testWin = g.testWin = wx.Frame(g.frame, -1, 'Panel: ' + name,

                                                   pos=pos, name=STD_NAME)
                 testWin.panel = res.LoadPanel(testWin, STD_NAME)
                 testWin.SetClientSize(testWin.GetBestSize())
                                                   pos=pos, name=STD_NAME)
                 testWin.panel = res.LoadPanel(testWin, STD_NAME)
                 testWin.SetClientSize(testWin.GetBestSize())


@@ -855,20 +905,20 @@ class XML_Tree(wxTreeCtrl):
                 testWin.Layout()
                 testWin.SetPosition(pos)
                 testWin.Show(True)
                 testWin.Layout()
                 testWin.SetPosition(pos)
                 testWin.Show(True)

-                # Dialog's default code does not produce EVT_CLOSE
-                EVT_BUTTON(testWin, wxID_OK, self.OnCloseTestWin)
-                EVT_BUTTON(testWin, wxID_CANCEL, self.OnCloseTestWin)
+                # Dialog's default code does not produce wx.EVT_CLOSE
+                wx.EVT_BUTTON(testWin, wx.ID_OK, self.OnCloseTestWin)
+                wx.EVT_BUTTON(testWin, wx.ID_CANCEL, self.OnCloseTestWin)

             elif xxx.__class__ == xxxWizard:
             elif xxx.__class__ == xxxWizard:

-                wiz = wxPreWizard()
+                wiz = wx.wizard.PreWizard()

                 res.LoadOnObject(wiz, None, STD_NAME, 'wxWizard')
                 # Find first page (don't know better way)
                 firstPage = None
                 for w in wiz.GetChildren():
                 res.LoadOnObject(wiz, None, STD_NAME, 'wxWizard')
                 # Find first page (don't know better way)
                 firstPage = None
                 for w in wiz.GetChildren():

-                    if isinstance(w, wxWizardPage):
+                    if isinstance(w, wx.wizard.WizardPage):

                         firstPage = w
                         break
                 if not firstPage:
                         firstPage = w
                         break
                 if not firstPage:

-                    wxLogError('Wizard is empty')
+                    wx.LogError('Wizard is empty')

                 else:
                     # Wizard should be modal
                     self.SetItemBold(item)
                 else:
                     # Wizard should be modal
                     self.SetItemBold(item)


@@ -878,14 +928,14 @@ class XML_Tree(wxTreeCtrl):
             elif xxx.__class__ in [xxxWizardPage, xxxWizardPageSimple]:
                 # Create new frame
                 if not testWin:
             elif xxx.__class__ in [xxxWizardPage, xxxWizardPageSimple]:
                 # Create new frame
                 if not testWin:

-                    testWin = g.testWin = wxFrame(g.frame, -1, 'Wizard page: ' + name,
+                    testWin = g.testWin = wx.Frame(g.frame, -1, 'Wizard page: ' + name,

                                                   pos=pos, name=STD_NAME)
                                                   pos=pos, name=STD_NAME)

-                testWin.panel = wxPrePanel()
+                testWin.panel = wx.PrePanel()

                 res.LoadOnObject(testWin.panel, testWin, STD_NAME, 'wxPanel')
                 testWin.SetClientSize(testWin.GetBestSize())
                 testWin.Show(True)
             elif xxx.__class__ == xxxMenuBar:
                 res.LoadOnObject(testWin.panel, testWin, STD_NAME, 'wxPanel')
                 testWin.SetClientSize(testWin.GetBestSize())
                 testWin.Show(True)
             elif xxx.__class__ == xxxMenuBar:

-                testWin = g.testWin = wxFrame(g.frame, -1, 'MenuBar: ' + name,
+                testWin = g.testWin = wx.Frame(g.frame, -1, 'MenuBar: ' + name,

                                               pos=pos, name=STD_NAME)
                 testWin.panel = None
                 # Set status bar to display help
                                               pos=pos, name=STD_NAME)
                 testWin.panel = None
                 # Set status bar to display help


@@ -894,7 +944,7 @@ class XML_Tree(wxTreeCtrl):
                 testWin.SetMenuBar(testWin.menuBar)
                 testWin.Show(True)
             elif xxx.__class__ == xxxToolBar:
                 testWin.SetMenuBar(testWin.menuBar)
                 testWin.Show(True)
             elif xxx.__class__ == xxxToolBar:

-                testWin = g.testWin = wxFrame(g.frame, -1, 'ToolBar: ' + name,
+                testWin = g.testWin = wx.Frame(g.frame, -1, 'ToolBar: ' + name,

                                               pos=pos, name=STD_NAME)
                 testWin.panel = None
                 # Set status bar to display help
                                               pos=pos, name=STD_NAME)
                 testWin.panel = None
                 # Set status bar to display help


@@ -904,7 +954,7 @@ class XML_Tree(wxTreeCtrl):
                 testWin.Show(True)
             if testWin:
                 testWin.item = item
                 testWin.Show(True)
             if testWin:
                 testWin.item = item

-                EVT_CLOSE(testWin, self.OnCloseTestWin)
+                wx.EVT_CLOSE(testWin, self.OnCloseTestWin)

                 testWin.highLight = None
                 if highLight and not self.pendingHighLight:
                     self.HighLight(highLight)
                 testWin.highLight = None
                 if highLight and not self.pendingHighLight:
                     self.HighLight(highLight)


@@ -915,10 +965,9 @@ class XML_Tree(wxTreeCtrl):
                 g.testWin.Destroy()
                 g.testWin = None
             inf = sys.exc_info()
                 g.testWin.Destroy()
                 g.testWin = None
             inf = sys.exc_info()

-            wxLogError(traceback.format_exception(inf[0], inf[1], None)[-1])
-            wxLogError('Error loading resource')
-        wxMemoryFSHandler_RemoveFile('xxx.xrc')
-        wxEndBusyCursor()
+            wx.LogError(traceback.format_exception(inf[0], inf[1], None)[-1])
+            wx.LogError('Error loading resource')
+        wx.MemoryFSHandler.RemoveFile('xxx.xrc')

 
     def CloseTestWindow(self):
         if not g.testWin: return
 
     def CloseTestWindow(self):
         if not g.testWin: return


@@ -931,6 +980,17 @@ class XML_Tree(wxTreeCtrl):
     def OnCloseTestWin(self, evt):
         self.CloseTestWindow()
 
     def OnCloseTestWin(self, evt):
         self.CloseTestWindow()
 

+    # Return index in parent, for real window children
+    def WindowIndex(self, item):
+        n = 0                           # index of sibling
+        prev = self.GetPrevSibling(item)
+        while prev.IsOk():
+            # MenuBar is not a child
+            if not isinstance(self.GetPyData(prev), xxxMenuBar):
+                n += 1
+            prev = self.GetPrevSibling(prev)
+        return n
+

     # Return item index in parent
     def ItemIndex(self, item):
         n = 0                           # index of sibling
     # Return item index in parent
     def ItemIndex(self, item):
         n = 0                           # index of sibling


@@ -950,7 +1010,7 @@ class XML_Tree(wxTreeCtrl):
         return l
     # Get item position from full index
     def ItemAtFullIndex(self, index):
         return l
     # Get item position from full index
     def ItemAtFullIndex(self, index):

-        if index is None: return wxTreeItemId()
+        if index is None: return wx.TreeItemId()

         item = self.root
         for i in index:
             item = self.GetFirstChild(item)[0]
         item = self.root
         for i in index:
             item = self.GetFirstChild(item)[0]


@@ -965,17 +1025,25 @@ class XML_Tree(wxTreeCtrl):
             return False
         return not (self.IsExpanded(item) and self.GetChildrenCount(item, False))
 
             return False
         return not (self.IsExpanded(item) and self.GetChildrenCount(item, False))
 

+    # Override to use like single-selection tree
+    def GetSelection(self):
+        return self.selection
+    def SelectItem(self, item):
+        self.UnselectAll()
+        self.ChangeSelection(item)
+        wx.TreeCtrl.SelectItem(self, item)
+

     # Pull-down
     def OnRightDown(self, evt):
         pullDownMenu = g.pullDownMenu
         # select this item
         pt = evt.GetPosition();
         item, flags = self.HitTest(pt)
     # Pull-down
     def OnRightDown(self, evt):
         pullDownMenu = g.pullDownMenu
         # select this item
         pt = evt.GetPosition();
         item, flags = self.HitTest(pt)

-        if item.Ok() and flags & wxTREE_HITTEST_ONITEM:
+        if item.Ok() and flags & wx.TREE_HITTEST_ONITEM:

             self.SelectItem(item)
 
         # Setup menu
             self.SelectItem(item)
 
         # Setup menu

-        menu = wxMenu()
+        menu = wx.Menu()

 
         item = self.selection
         if not item:
 
         item = self.selection
         if not item:


@@ -984,7 +1052,7 @@ class XML_Tree(wxTreeCtrl):
         else:
 #            self.ctrl = evt.ControlDown() # save Ctrl state
 #            self.shift = evt.ShiftDown()  # and Shift too
         else:
 #            self.ctrl = evt.ControlDown() # save Ctrl state
 #            self.shift = evt.ShiftDown()  # and Shift too

-            m = wxMenu()                  # create menu
+            m = wx.Menu()                  # create menu

             if self.ctrl:
                 needInsert = True
             else:
             if self.ctrl:
                 needInsert = True
             else:


@@ -1008,31 +1076,33 @@ class XML_Tree(wxTreeCtrl):
                     SetMenu(m, pullDownMenu.stdButtons)
                 else:
                     SetMenu(m, pullDownMenu.controls)
                     SetMenu(m, pullDownMenu.stdButtons)
                 else:
                     SetMenu(m, pullDownMenu.controls)

-                    if xxx.__class__ == xxxNotebook:
+                    if xxx.__class__ in [xxxNotebook, xxxChoicebook, xxxListbook]:

                         m.Enable(m.FindItem('sizer'), False)
                     elif not (xxx.isSizer or xxx.parent and xxx.parent.isSizer):
                         m.Enable(ID_NEW.SPACER, False)
                         m.Enable(m.FindItem('sizer'), False)
                     elif not (xxx.isSizer or xxx.parent and xxx.parent.isSizer):
                         m.Enable(ID_NEW.SPACER, False)

+                    if xxx.__class__ is not xxxFrame:
+                        m.Enable(ID_NEW.MENU_BAR, False)

                 m.AppendSeparator()
                 m.Append(ID_NEW.REF, 'reference...', 'Create object_ref node')
             # Select correct label for create menu
             if not needInsert:
                 if self.shift:
                 m.AppendSeparator()
                 m.Append(ID_NEW.REF, 'reference...', 'Create object_ref node')
             # Select correct label for create menu
             if not needInsert:
                 if self.shift:

-                    menu.AppendMenu(wxNewId(), 'Insert Child', m,
+                    menu.AppendMenu(wx.NewId(), 'Insert Child', m,

                                     'Create child object as the first child')
                 else:
                                     'Create child object as the first child')
                 else:

-                    menu.AppendMenu(wxNewId(), 'Append Child', m,
+                    menu.AppendMenu(wx.NewId(), 'Append Child', m,

                                     'Create child object as the last child')
             else:
                 if self.shift:
                                     'Create child object as the last child')
             else:
                 if self.shift:

-                    menu.AppendMenu(wxNewId(), 'Create Sibling', m,
+                    menu.AppendMenu(wx.NewId(), 'Create Sibling', m,

                                     'Create sibling before selected object')
                 else:
                                     'Create sibling before selected object')
                 else:

-                    menu.AppendMenu(wxNewId(), 'Create Sibling', m,
+                    menu.AppendMenu(wx.NewId(), 'Create Sibling', m,

                                     'Create sibling after selected object')
             # Build replace menu
             if item != self.root:
                 xxx = self.GetPyData(item).treeObject()
                                     'Create sibling after selected object')
             # Build replace menu
             if item != self.root:
                 xxx = self.GetPyData(item).treeObject()

-                m = wxMenu()                  # create replace menu
+                m = wx.Menu()                  # create replace menu

                 if xxx.__class__ == xxxMenuBar:
                     m.Append(1000 + ID_NEW.MENU, 'Menu', 'Create menu')
                 elif xxx.__class__ in [xxxMenu, xxxMenuItem]:
                 if xxx.__class__ == xxxMenuBar:
                     m.Append(1000 + ID_NEW.MENU, 'Menu', 'Create menu')
                 elif xxx.__class__ in [xxxMenu, xxxMenuItem]:


@@ -1049,20 +1119,20 @@ class XML_Tree(wxTreeCtrl):
                     SetMenu(m, pullDownMenu.sizers, shift=True)
                 else:
                     SetMenu(m, pullDownMenu.controls, shift=True)
                     SetMenu(m, pullDownMenu.sizers, shift=True)
                 else:
                     SetMenu(m, pullDownMenu.controls, shift=True)

-                id = wxNewId()
+                id = wx.NewId()

                 menu.AppendMenu(id, 'Replace With', m)
                 if not m.GetMenuItemCount(): menu.Enable(id, False)
                 menu.Append(pullDownMenu.ID_SUBCLASS, 'Subclass...',
                             'Set "subclass" property')
             menu.AppendSeparator()
             # Not using standart IDs because we don't want to show shortcuts
                 menu.AppendMenu(id, 'Replace With', m)
                 if not m.GetMenuItemCount(): menu.Enable(id, False)
                 menu.Append(pullDownMenu.ID_SUBCLASS, 'Subclass...',
                             'Set "subclass" property')
             menu.AppendSeparator()
             # Not using standart IDs because we don't want to show shortcuts

-            menu.Append(wxID_CUT, 'Cut', 'Cut to the clipboard')
-            menu.Append(wxID_COPY, 'Copy', 'Copy to the clipboard')
+            menu.Append(wx.ID_CUT, 'Cut', 'Cut to the clipboard')
+            menu.Append(wx.ID_COPY, 'Copy', 'Copy to the clipboard')

             if self.ctrl and item != self.root:
                 menu.Append(pullDownMenu.ID_PASTE_SIBLING, 'Paste Sibling',
                             'Paste from the clipboard as a sibling')
             else:
             if self.ctrl and item != self.root:
                 menu.Append(pullDownMenu.ID_PASTE_SIBLING, 'Paste Sibling',
                             'Paste from the clipboard as a sibling')
             else:

-                menu.Append(wxID_PASTE, 'Paste', 'Paste from the clipboard')
+                menu.Append(wx.ID_PASTE, 'Paste', 'Paste from the clipboard')

             menu.Append(pullDownMenu.ID_DELETE,
                                 'Delete', 'Delete object')
             if self.ItemHasChildren(item):
             menu.Append(pullDownMenu.ID_DELETE,
                                 'Delete', 'Delete object')
             if self.ItemHasChildren(item):