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

Second fix for Copy/Paste (using expat.native_encoding property).

Browse Source 
Added cellpos,cellspan properties for Spacer in GridBag sizer.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Roman Rolinsky
2006-04-05 14:55:17 +00:00
parent a29cce78aa
commit 28e65e0fa0
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ Options:
from globals import *
import os, sys, getopt, re, traceback, tempfile, shutil, cPickle
from xml.parsers import expat
# Local modules
from tree import * # imports xxx which imports params
@@ -418,8 +419,7 @@ class Frame(wxFrame):
data = wx.CustomDataObject('XRCED')
# Set encoding in header
# (False,True)
s = (xxx.element.toxml(encoding=g.currentEncoding),
xxx.element.toxml())[not g.currentEncoding]
s = xxx.element.toxml(encoding=expat.native_encoding)
data.SetData(cPickle.dumps(s))
wx.TheClipboard.SetData(data)
wx.TheClipboard.Close()
@@ -593,8 +593,7 @@ class Frame(wxFrame):
if wx.TheClipboard.Open():
data = wx.CustomDataObject('XRCED')
# (False, True)
s = (elem.toxml(encoding=g.currentEncoding),
elem.toxml())[not g.currentEncoding]
s = elem.toxml(encoding=expat.native_encoding)
data.SetData(cPickle.dumps(s))
wx.TheClipboard.SetData(data)
wx.TheClipboard.Close()