Updated to optionally use Carbon Scrap manager.

diff --git a/Mac/Demo/textedit/ped.py b/Mac/Demo/textedit/ped.py
index 524b92ad328d611af65615d283f5bdb5da9e5234..6a0f8823046a11aaee5222015f312d280e6e8b8f 100644 (file)
--- a/Mac/Demo/textedit/ped.py
+++ b/Mac/Demo/textedit/ped.py
@@ -141,7 +141,10 @@ class TEWindow(ScrolledWindow):
        def menu_cut(self):
                self.ted.TESelView()
                self.ted.TECut()
-               Scrap.ZeroScrap()
+               if hasattr(Scrap, 'ZeroScrap'):
+                       Scrap.ZeroScrap()
+               else:
+                       Scrap.ClearCurrentScrap()
                TE.TEToScrap()
                self.updatescrollbars()
                self.parent.updatemenubar()
@@ -149,7 +152,10 @@ class TEWindow(ScrolledWindow):
                
        def menu_copy(self):
                self.ted.TECopy()
-               Scrap.ZeroScrap()
+               if hasattr(Scrap, 'ZeroScrap'):
+                       Scrap.ZeroScrap()
+               else:
+                       Scrap.ClearCurrentScrap()
                TE.TEToScrap()
                self.updatescrollbars()
                self.parent.updatemenubar()
@@ -226,8 +232,13 @@ class Ped(Application):
                        if hasattr(Scrap, 'InfoScrap'):
                                on = (Scrap.InfoScrap()[0] <> 0)
                        else:
-                               # Not there yet on Carbon, simply always enable
-                               on = 1
+                               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)
                                self.pastegroup_on = on

diff --git a/Mac/Demo/waste/htmled.py b/Mac/Demo/waste/htmled.py
index fc2ce5b437ddc4a88d9a743e59fc34b1e6a380a7..b590b1dd617cedc9e62a122758c315dae3ae165b 100644 (file)
--- a/Mac/Demo/waste/htmled.py
+++ b/Mac/Demo/waste/htmled.py
@@ -297,14 +297,19 @@ class WasteWindow(ScrolledWindow):
                
        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()

diff --git a/Mac/Demo/waste/swed.py b/Mac/Demo/waste/swed.py
index e2c266657bd1584af27a31f9790f4455d7d83916..62b027e4767ef3a3f322a179a12da9cc11191d2b 100644 (file)
--- a/Mac/Demo/waste/swed.py
+++ b/Mac/Demo/waste/swed.py
@@ -235,14 +235,19 @@ class WasteWindow(ScrolledWindow):
                
        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()

diff --git a/Mac/Demo/waste/wed.py b/Mac/Demo/waste/wed.py
index 00ff8d8d762fd5ea4002e9d4217ed0ca921dfbe5..14bee45f2d7b4aa0c30a97a09d47f9341d2b614a 100644 (file)
--- a/Mac/Demo/waste/wed.py
+++ b/Mac/Demo/waste/wed.py
@@ -190,15 +190,20 @@ class WasteWindow(ScrolledWindow):
                
        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()