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

fix for memory leak in paste

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Roman Rolinsky
2006-02-14 20:58:11 +00:00
parent 67cbdfc150
commit 1893848ef7
2 changed files with 5 additions and 5 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-0' version = '0.1.7-1'
# Minimal wxWindows version # Minimal wxWindows version
MinWxVersion = (2,6,0) MinWxVersion = (2,6,0)
if wxVERSION[:3] < MinWxVersion: if wxVERSION[:3] < MinWxVersion:

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

@@ -415,7 +415,7 @@ class Frame(wxFrame):
xxx = tree.GetPyData(selected) xxx = tree.GetPyData(selected)
wx.TheClipboard.Open() wx.TheClipboard.Open()
data = wx.CustomDataObject('XRCED') data = wx.CustomDataObject('XRCED')
data.SetData(cPickle.dumps(xxx.element)) data.SetData(cPickle.dumps(xxx.element.toxml()))
wx.TheClipboard.SetData(data) wx.TheClipboard.SetData(data)
wx.TheClipboard.Close() wx.TheClipboard.Close()
self.SetStatusText('Copied') self.SetStatusText('Copied')
@@ -455,10 +455,10 @@ class Frame(wxFrame):
return return
wx.TheClipboard.GetData(data) wx.TheClipboard.GetData(data)
wx.TheClipboard.Close() wx.TheClipboard.Close()
elem = cPickle.loads(data.GetData()) xml = cPickle.loads(data.GetData()) # xml representation of element
elem = minidom.parseString(xml).childNodes[0]
# Tempopary xxx object to test things # Tempopary xxx object to test things
xxx = MakeXXXFromDOM(parent, elem) xxx = MakeXXXFromDOM(parent, elem)
# Check compatibility # Check compatibility
error = False error = False
# Top-level # Top-level
@@ -925,7 +925,7 @@ Homepage: http://xrced.sourceforge.net\
# Update tools # Update tools
g.tools.UpdateUI() g.tools.UpdateUI()
#undoMan.RegisterUndo(UndoPasteCreate(parentLeaf, parent, newItem, selected)) undoMan.RegisterUndo(UndoPasteCreate(parentLeaf, parent, newItem, selected))
# Update view? # Update view?
if g.testWin and tree.IsHighlatable(selected): if g.testWin and tree.IsHighlatable(selected):
if conf.autoRefresh: if conf.autoRefresh: