Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for copy/paste to work with i18n

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Roman Rolinsky
2006-03-31 14:36:34 +00:00
parent 93a57d19fe
commit ebaaf8f630
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/wx/tools/XRCed/globals.py
View File

@@ -15,7 +15,7 @@ import sys
# Global constants # Global constants
progname = 'XRCed' progname = 'XRCed'
version = '0.1.7-2' version = '0.1.7-3'
# Minimal wxWindows version # Minimal wxWindows version
MinWxVersion = (2,6,0) MinWxVersion = (2,6,0)
if wxVERSION[:3] < MinWxVersion: if wxVERSION[:3] < MinWxVersion:

11
wxPython/wx/tools/XRCed/xrced.py
View File

@@ -416,7 +416,11 @@ class Frame(wxFrame):
xxx = tree.GetPyData(selected) xxx = tree.GetPyData(selected)
if wx.TheClipboard.Open(): if wx.TheClipboard.Open():
data = wx.CustomDataObject('XRCED') 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.SetData(data)
wx.TheClipboard.Close() wx.TheClipboard.Close()
self.SetStatusText('Copied') self.SetStatusText('Copied')
@@ -588,7 +592,10 @@ class Frame(wxFrame):
if evt.GetId() == wxID_CUT: if evt.GetId() == wxID_CUT:
if wx.TheClipboard.Open(): if wx.TheClipboard.Open():
data = wx.CustomDataObject('XRCED') 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.SetData(data)
wx.TheClipboard.Close() wx.TheClipboard.Close()
else: else: