added wxDialog::GetEscapeId()

[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 95fa519d1e937491d9d8d74b26da203e4de60e35..0790e2fafb029c793ce7e06cd2221ec5f0e41006 100644 (file)
--- a/wxPython/wx/tools/XRCed/tree.py
+++ b/wxPython/wx/tools/XRCed/tree.py
@@ -20,9 +20,14 @@ class MemoryFile:
         self.buffer = ''
     def write(self, data):
         if g.currentEncoding:
         self.buffer = ''
     def write(self, data):
         if g.currentEncoding:

-            self.buffer += data.encode(g.currentEncoding)
+            encoding = g.currentEncoding

         else:
         else:

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

     def close(self):
         wxMemoryFSHandler_AddFile(self.name, self.buffer)
 
     def close(self):
         wxMemoryFSHandler_AddFile(self.name, self.buffer)
 


@@ -579,6 +584,9 @@ class XML_Tree(wxTreeCtrl):
         # Top-level sizer? return window's sizer
         if xxx.isSizer and isinstance(parentWin, wxWindow):
             return parentWin.GetSizer()
         # Top-level sizer? return window's sizer
         if xxx.isSizer and isinstance(parentWin, wxWindow):
             return parentWin.GetSizer()

+        elif isinstance(xxx.parent, xxxToolBar):
+            # How to get tool from toolbar?
+            return parentWin.GetChildren()[0]

         # Otherwise get parent's object and it's child
         child = parentWin.GetChildren()[self.ItemIndex(item)]
         # Return window or sizer for sizer items
         # Otherwise get parent's object and it's child
         child = parentWin.GetChildren()[self.ItemIndex(item)]
         # Return window or sizer for sizer items


@@ -622,7 +630,7 @@ class XML_Tree(wxTreeCtrl):
         g.panel.SetData(xxx)
         # Update tools
         g.tools.UpdateUI()
         g.panel.SetData(xxx)
         # Update tools
         g.tools.UpdateUI()

-        # Hightlighting is done in OnIdle
+        # Highlighting is done in OnIdle

         self.pendingHighLight = self.selection
 
     # Check if item is in testWin subtree
         self.pendingHighLight = self.selection
 
     # Check if item is in testWin subtree


@@ -648,7 +656,7 @@ class XML_Tree(wxTreeCtrl):
         obj, pos = self.FindNodeObject(item), self.FindNodePos(item)
         size = obj.GetSize()
         # Highlight
         obj, pos = self.FindNodeObject(item), self.FindNodePos(item)
         size = obj.GetSize()
         # Highlight

-        # Nagative positions are not working wuite well
+        # Negative positions are not working quite well

         if g.testWin.highLight:
             g.testWin.highLight.Replace(pos, size)
         else:
         if g.testWin.highLight:
             g.testWin.highLight.Replace(pos, size)
         else:


@@ -670,7 +678,7 @@ class XML_Tree(wxTreeCtrl):
         if g.testWin:     # Reset old
             self.SetItemBold(g.testWin.item, False)
         self.CreateTestWin(item)
         if g.testWin:     # Reset old
             self.SetItemBold(g.testWin.item, False)
         self.CreateTestWin(item)

-        # Maybe an error occured, so we need to test
+        # Maybe an error occurred, so we need to test

         if g.testWin: self.SetItemBold(g.testWin.item)
 
     # Double-click on Linux
         if g.testWin: self.SetItemBold(g.testWin.item)
 
     # Double-click on Linux