fix for copy/paste to work with i18n

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/tools/XRCed/globals.py b/wxPython/wx/tools/XRCed/globals.py
index d99e82352300a17f70c93acfd8799589af3b186b..aa405252836c73fdd6709e7cd1f3c022f715d9fa 100644 (file)
--- a/wxPython/wx/tools/XRCed/globals.py
+++ b/wxPython/wx/tools/XRCed/globals.py
@@ -15,7 +15,7 @@ import sys
 # Global constants
 
 progname = 'XRCed'
 # Global constants
 
 progname = 'XRCed'

-version = '0.1.7-2'
+version = '0.1.7-3'

 # Minimal wxWindows version
 MinWxVersion = (2,6,0)
 if wxVERSION[:3] < MinWxVersion:
 # Minimal wxWindows version
 MinWxVersion = (2,6,0)
 if wxVERSION[:3] < MinWxVersion:

diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py
index 853c0abe96683705d2065e685b6c7c000e03a16b..461a72dbd42bba150f7e1b642720037b64b33d2c 100644 (file)
--- a/wxPython/wx/tools/XRCed/xrced.py
+++ b/wxPython/wx/tools/XRCed/xrced.py
@@ -416,7 +416,11 @@ class Frame(wxFrame):
         xxx = tree.GetPyData(selected)
         if wx.TheClipboard.Open():
             data = wx.CustomDataObject('XRCED')
         xxx = tree.GetPyData(selected)
         if wx.TheClipboard.Open():
             data = wx.CustomDataObject('XRCED')

-            data.SetData(cPickle.dumps(xxx.element.toxml()))
+            # Set encoding in header
+            # (False,True)
+            s = (xxx.element.toxml(encoding=g.currentEncoding),
+                 xxx.element.toxml())[not g.currentEncoding] 
+            data.SetData(cPickle.dumps(s))

             wx.TheClipboard.SetData(data)
             wx.TheClipboard.Close()
             self.SetStatusText('Copied')
             wx.TheClipboard.SetData(data)
             wx.TheClipboard.Close()
             self.SetStatusText('Copied')


@@ -588,7 +592,10 @@ class Frame(wxFrame):
         if evt.GetId() == wxID_CUT:
             if wx.TheClipboard.Open():
                 data = wx.CustomDataObject('XRCED')
         if evt.GetId() == wxID_CUT:
             if wx.TheClipboard.Open():
                 data = wx.CustomDataObject('XRCED')

-                data.SetData(cPickle.dumps(elem.toxml()))
+                # (False, True)
+                s = (elem.toxml(encoding=g.currentEncoding),
+                     elem.toxml())[not g.currentEncoding] 
+                data.SetData(cPickle.dumps(s))

                 wx.TheClipboard.SetData(data)
                 wx.TheClipboard.Close()
             else:
                 wx.TheClipboard.SetData(data)
                 wx.TheClipboard.Close()
             else: