[Python-checkins] CVS: python/dist/src/Mac/Tools/IDE Wtext.py,1.16,1.16.6.1

Jack Jansen jackjansen@users.sourceforge.net
Wed, 27 Feb 2002 14:29:03 -0800


Update of /cvsroot/python/python/dist/src/Mac/Tools/IDE
In directory usw-pr-cvs1:/tmp/cvs-serv22263/Python 2.2/Mac/Tools/IDE

Modified Files:
      Tag: release22-maint
	Wtext.py 
Log Message:
Backport of 1.17:
Use the Carbon scrap manager interface if the old interface isn't available.

Index: Wtext.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Tools/IDE/Wtext.py,v
retrieving revision 1.16
retrieving revision 1.16.6.1
diff -C2 -d -r1.16 -r1.16.6.1
*** Wtext.py	4 Dec 2001 13:30:29 -0000	1.16
--- Wtext.py	27 Feb 2002 22:28:58 -0000	1.16.6.1
***************
*** 431,435 ****
  		if selbegin == selend:
  			return
! 		Scrap.ZeroScrap()
  		self.ted.WECopy()
  		self.updatescrollbars()
--- 431,438 ----
  		if selbegin == selend:
  			return
! 		if hasattr(Scrap, 'ZeroScrap'):
! 			Scrap.ZeroScrap()
! 		else:
! 			Scrap.ClearCurrentScrap()
  		self.ted.WECopy()
  		self.updatescrollbars()
***************
*** 439,443 ****
  		if selbegin == selend:
  			return
! 		Scrap.ZeroScrap()
  		self.ted.WECut()
  		self.updatescrollbars()
--- 442,449 ----
  		if selbegin == selend:
  			return
! 		if hasattr(Scrap, 'ZeroScrap'):
! 			Scrap.ZeroScrap()
! 		else:
! 			Scrap.ClearCurrentScrap()
  		self.ted.WECut()
  		self.updatescrollbars()