[Python-checkins] CVS: python/dist/src/Mac/Demo/textedit ped.py,1.8,1.9

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Demo/textedit
In directory usw-pr-cvs1:/tmp/cvs-serv32190/Python/Mac/Demo/textedit

Modified Files:
	ped.py 
Log Message:
Updated to optionally use Carbon Scrap manager.

Index: ped.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Demo/textedit/ped.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ped.py	2001/08/25 12:07:57	1.8
--- ped.py	2001/12/31 15:02:56	1.9
***************
*** 142,146 ****
  		self.ted.TESelView()
  		self.ted.TECut()
! 		Scrap.ZeroScrap()
  		TE.TEToScrap()
  		self.updatescrollbars()
--- 142,149 ----
  		self.ted.TESelView()
  		self.ted.TECut()
! 		if hasattr(Scrap, 'ZeroScrap'):
! 			Scrap.ZeroScrap()
! 		else:
! 			Scrap.ClearCurrentScrap()
  		TE.TEToScrap()
  		self.updatescrollbars()
***************
*** 150,154 ****
  	def menu_copy(self):
  		self.ted.TECopy()
! 		Scrap.ZeroScrap()
  		TE.TEToScrap()
  		self.updatescrollbars()
--- 153,160 ----
  	def menu_copy(self):
  		self.ted.TECopy()
! 		if hasattr(Scrap, 'ZeroScrap'):
! 			Scrap.ZeroScrap()
! 		else:
! 			Scrap.ClearCurrentScrap()
  		TE.TEToScrap()
  		self.updatescrollbars()
***************
*** 227,232 ****
  				on = (Scrap.InfoScrap()[0] <> 0)
  			else:
! 				# Not there yet on Carbon, simply always enable
! 				on = 1
  			if on <> self.pastegroup_on:
  				self.pasteitem.enable(on)
--- 233,243 ----
  				on = (Scrap.InfoScrap()[0] <> 0)
  			else:
! 				flavors = Scrap.GetCurrentScrap().GetScrapFlavorInfoList()
! 				for tp, info in flavors:
! 					if tp == 'TEXT':
! 						on = 1
! 						break
! 				else:
! 					on = 0
  			if on <> self.pastegroup_on:
  				self.pasteitem.enable(on)