commit 9cf00dd5510cb433d4bc3fd941127c6675f5558d
author Jack Jansen <jack.jansen@cwi.nl> Mon Dec 31 15:02:56 2001 +0000
committer Jack Jansen <jack.jansen@cwi.nl> Mon Dec 31 15:02:56 2001 +0000
tree 75b8927edd8b999a768e087f6dbaf52df22ba039
parent ad8381a8f008ed104c84cd59a14f4161083d60da

Updated to optionally use Carbon Scrap manager.

Mac/Demo/waste/htmled.py

diff --git a/Mac/Demo/waste/htmled.py b/Mac/Demo/waste/htmled.py
index fc2ce5b..b590b1d 100644
--- a/Mac/Demo/waste/htmled.py
+++ b/Mac/Demo/waste/htmled.py
@@ -297,14 +297,19 @@
 		
 	def menu_cut(self):
 		self.ted.WESelView()
-		self.ted.WECut()
-		Scrap.ZeroScrap()
+		if hasattr(Scrap, 'ZeroScrap'):
+			Scrap.ZeroScrap()
+		else:
+			Scrap.ClearCurrentScrap()
 		self.ted.WECut()
 		self.updatescrollbars()
 		self.parent.updatemenubar()
 		
 	def menu_copy(self):
-		Scrap.ZeroScrap()
+		if hasattr(Scrap, 'ZeroScrap'):
+			Scrap.ZeroScrap()
+		else:
+			Scrap.ClearCurrentScrap()
 		self.ted.WECopy()
 		self.updatescrollbars()
 		self.parent.updatemenubar()

Mac/Demo/waste/swed.py

diff --git a/Mac/Demo/waste/swed.py b/Mac/Demo/waste/swed.py
index e2c2666..62b027e 100644
--- a/Mac/Demo/waste/swed.py
+++ b/Mac/Demo/waste/swed.py
@@ -235,14 +235,19 @@
 		
 	def menu_cut(self):
 		self.ted.WESelView()
-		self.ted.WECut()
-		Scrap.ZeroScrap()
+		if hasattr(Scrap, 'ZeroScrap'):
+			Scrap.ZeroScrap()
+		else:
+			Scrap.ClearCurrentScrap()
 		self.ted.WECut()
 		self.updatescrollbars()
 		self.parent.updatemenubar()
 		
 	def menu_copy(self):
-		Scrap.ZeroScrap()
+		if hasattr(Scrap, 'ZeroScrap'):
+			Scrap.ZeroScrap()
+		else:
+			Scrap.ClearCurrentScrap()
 		self.ted.WECopy()
 		self.updatescrollbars()
 		self.parent.updatemenubar()

Mac/Demo/waste/wed.py

diff --git a/Mac/Demo/waste/wed.py b/Mac/Demo/waste/wed.py
index 00ff8d8..14bee45 100644
--- a/Mac/Demo/waste/wed.py
+++ b/Mac/Demo/waste/wed.py
@@ -190,15 +190,20 @@
 		
 	def menu_cut(self):
 		self.ted.WESelView()
-		self.ted.WECut()
-		Scrap.ZeroScrap()
+		if hasattr(Scrap, 'ZeroScrap'):
+			Scrap.ZeroScrap()
+		else:
+			Scrap.ClearCurrentScrap()
 		self.ted.WECut()
 		self.updatescrollbars()
 		self.parent.updatemenubar()
 		self.changed = 1
 		
 	def menu_copy(self):
-		Scrap.ZeroScrap()
+		if hasattr(Scrap, 'ZeroScrap'):
+			Scrap.ZeroScrap()
+		else:
+			Scrap.ClearCurrentScrap()
 		self.ted.WECopy()
 		self.updatescrollbars()
 		self.parent.updatemenubar()