Second part of '[ 1216148 ] cleanup: unused variables and declarations'.

[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 cb68fa49a64c5abf66c71d4616a432595b928786..249bad55c882e0d2c1cb35723704f4d55125cd84 100644 (file)
--- a/wxPython/wx/tools/XRCed/tree.py
+++ b/wxPython/wx/tools/XRCed/tree.py
@@ -19,7 +19,10 @@ class MemoryFile:
         self.name = name
         self.buffer = ''
     def write(self, data):
         self.name = name
         self.buffer = ''
     def write(self, data):

-        self.buffer += data.encode(g.currentEncoding)
+        if g.currentEncoding:
+            self.buffer += data.encode(g.currentEncoding)
+        else:
+            self.buffer += data.encode()

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


@@ -105,6 +108,7 @@ class PullDownMenu:
     ID_EXPAND = wxNewId()
     ID_COLLAPSE = wxNewId()
     ID_PASTE_SIBLING = wxNewId()
     ID_EXPAND = wxNewId()
     ID_COLLAPSE = wxNewId()
     ID_PASTE_SIBLING = wxNewId()

+    ID_TOOL_PASTE = wxNewId()

     ID_SUBCLASS = wxNewId()
 
     def __init__(self, parent):
     ID_SUBCLASS = wxNewId()
 
     def __init__(self, parent):


@@ -354,6 +358,8 @@ class HighLightBox:
     def Remove(self):
         map(wxWindow.Destroy, self.lines)
         g.testWin.highLight = None
     def Remove(self):
         map(wxWindow.Destroy, self.lines)
         g.testWin.highLight = None

+    def Refresh(self):
+        map(wxWindow.Refresh, self.lines)

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


@@ -616,7 +622,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


@@ -642,11 +648,12 @@ 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:
             g.testWin.highLight = HighLightBox(pos, size)
         if g.testWin.highLight:
             g.testWin.highLight.Replace(pos, size)
         else:
             g.testWin.highLight = HighLightBox(pos, size)

+        g.testWin.highLight.Refresh()

         g.testWin.highLight.item = item
 
     def ShowTestWindow(self, item):
         g.testWin.highLight.item = item
 
     def ShowTestWindow(self, item):


@@ -663,7 +670,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


@@ -768,7 +775,7 @@ class XML_Tree(wxTreeCtrl):
         memFile.close()                 # write to wxMemoryFS
         xmlFlags = wxXRC_NO_SUBCLASSING
         # Use translations if encoding is not specified
         memFile.close()                 # write to wxMemoryFS
         xmlFlags = wxXRC_NO_SUBCLASSING
         # Use translations if encoding is not specified

-        if g.currentEncoding == 'ascii':
+        if not g.currentEncoding:

             xmlFlags != wxXRC_USE_LOCALE
         res = wxXmlResource('', xmlFlags)
         res.Load('memory:xxx.xrc')
             xmlFlags != wxXRC_USE_LOCALE
         res = wxXmlResource('', xmlFlags)
         res.Load('memory:xxx.xrc')


@@ -874,7 +881,7 @@ class XML_Tree(wxTreeCtrl):
     def CloseTestWindow(self):
         if not g.testWin: return
         self.SetItemBold(g.testWin.item, False)
     def CloseTestWindow(self):
         if not g.testWin: return
         self.SetItemBold(g.testWin.item, False)

-        g.frame.tb.ToggleTool(g.frame.ID_LOCATE_TOOL, False)
+        g.frame.tb.ToggleTool(g.frame.ID_TOOL_LOCATE, False)

         g.testWinPos = g.testWin.GetPosition()
         g.testWin.Destroy()
         g.testWin = None
         g.testWinPos = g.testWin.GetPosition()
         g.testWin.Destroy()
         g.testWin = None