# HG changeset patch # User Laurent Bessard # Date 1365761540 -7200 # Node ID 474484781eacf7cea219f5103e878b94e385cdbf # Parent 4e44c2c3e0813a905ef03a2fdaca5997a21901ed# Parent 0ddbc39c91eea471fb10c0f9952d796c782f48f5 Merged diff -r 4e44c2c3e081 -r 474484781eac IDEFrame.py --- a/IDEFrame.py Fri Apr 12 14:53:14 2013 +0900 +++ b/IDEFrame.py Fri Apr 12 12:12:20 2013 +0200 @@ -881,11 +881,10 @@ def GetCopyBuffer(self, primary_selection=False): data = None - if primary_selection: - if wx.Platform != '__WXMSW__': - wx.TheClipboard.UsePrimarySelection(primary_selection) - else: - return data + if primary_selection and wx.Platform == '__WXMSW__': + return data + else: + wx.TheClipboard.UsePrimarySelection(primary_selection) if wx.TheClipboard.Open(): dataobj = wx.TextDataObject() if wx.TheClipboard.GetData(dataobj): @@ -894,11 +893,10 @@ return data def SetCopyBuffer(self, text, primary_selection=False): - if primary_selection: - if wx.Platform != '__WXMSW__': - wx.TheClipboard.UsePrimarySelection(primary_selection) - else: - return + if primary_selection and wx.Platform == '__WXMSW__': + return + else: + wx.TheClipboard.UsePrimarySelection(primary_selection) if wx.TheClipboard.Open(): data = wx.TextDataObject() data.SetText(text)