Import the MacOS toolbox modules from the Carbon package.

21 files changed, 91 insertions, 91 deletions

diff --git a/Mac/Demo/PICTbrowse/ICONbrowse.py b/Mac/Demo/PICTbrowse/ICONbrowse.py
index 865ff9e701..162fcb6bcc 100644
--- a/Mac/Demo/PICTbrowse/ICONbrowse.py
+++ b/Mac/Demo/PICTbrowse/ICONbrowse.py
@@ -2,14 +2,14 @@
 
 import FrameWork
 import EasyDialogs
-import Res
-import Qd
-import Win
-import Controls
-import List
+from Carbon import Res
+from Carbon import Qd
+from Carbon import Win
+from Carbon import Controls
+from Carbon import List
 import sys
 import struct
-import Icn
+from Carbon import Icn
 
 #
 # Resource definitions
diff --git a/Mac/Demo/PICTbrowse/PICTbrowse.py b/Mac/Demo/PICTbrowse/PICTbrowse.py
index da32b50ec0..e45b18c9d8 100644
--- a/Mac/Demo/PICTbrowse/PICTbrowse.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse.py
@@ -2,11 +2,11 @@
 
 import FrameWork
 import EasyDialogs
-import Res
-import Qd
-import Win
-import Controls
-import List
+from Carbon import Res
+from Carbon import Qd
+from Carbon import Win
+from Carbon import Controls
+from Carbon import List
 import sys
 import struct
 
diff --git a/Mac/Demo/PICTbrowse/PICTbrowse2.py b/Mac/Demo/PICTbrowse/PICTbrowse2.py
index 56440f20a2..7e146edf9e 100644
--- a/Mac/Demo/PICTbrowse/PICTbrowse2.py
+++ b/Mac/Demo/PICTbrowse/PICTbrowse2.py
@@ -2,11 +2,11 @@
 
 import FrameWork
 import EasyDialogs
-import Res
-import Qd
-import Win
-import Controls
-import List
+from Carbon import Res
+from Carbon import Qd
+from Carbon import Win
+from Carbon import Controls
+from Carbon import List
 import sys
 import struct
 
diff --git a/Mac/Demo/PICTbrowse/cicnbrowse.py b/Mac/Demo/PICTbrowse/cicnbrowse.py
index 47cd472bef..89f82184df 100644
--- a/Mac/Demo/PICTbrowse/cicnbrowse.py
+++ b/Mac/Demo/PICTbrowse/cicnbrowse.py
@@ -2,14 +2,14 @@
 
 import FrameWork
 import EasyDialogs
-import Res
-import Qd
-import Win
-import Controls
-import List
+from Carbon import Res
+from Carbon import Qd
+from Carbon import Win
+from Carbon import Controls
+from Carbon import List
 import sys
 import struct
-import Icn
+from Carbon import Icn
 
 #
 # Resource definitions
diff --git a/Mac/Demo/PICTbrowse/oldPICTbrowse.py b/Mac/Demo/PICTbrowse/oldPICTbrowse.py
index 0012958c16..01cf71c458 100644
--- a/Mac/Demo/PICTbrowse/oldPICTbrowse.py
+++ b/Mac/Demo/PICTbrowse/oldPICTbrowse.py
@@ -2,10 +2,10 @@
 
 import FrameWork
 import EasyDialogs
-import Res
-import Qd
-import Win
-import List
+from Carbon import Res
+from Carbon import Qd
+from Carbon import Win
+from Carbon import List
 import sys
 import struct
 
diff --git a/Mac/Demo/calldll/testcalldll.py b/Mac/Demo/calldll/testcalldll.py
index ef176d83fc..cdb24c3d4f 100644
--- a/Mac/Demo/calldll/testcalldll.py
+++ b/Mac/Demo/calldll/testcalldll.py
@@ -2,7 +2,7 @@ import calldll
 import macfs
 import sys
 import MacOS
-import Res
+from Carbon import Res
 
 fss, ok = macfs.PromptGetFile("Show me calldll.ppc.slb")
 
diff --git a/Mac/Demo/example1/dnslookup-1.py b/Mac/Demo/example1/dnslookup-1.py
index 294faad363..9a2ab286f1 100644
--- a/Mac/Demo/example1/dnslookup-1.py
+++ b/Mac/Demo/example1/dnslookup-1.py
@@ -2,8 +2,8 @@
 Res and Dlg in the process"""
 
 import EasyDialogs
-import Res
-import Dlg
+from Carbon import Res
+from Carbon import Dlg
 import sys
 import socket
 import string
diff --git a/Mac/Demo/example2/dnslookup-2.py b/Mac/Demo/example2/dnslookup-2.py
index e595b8e2da..20e7fa582d 100644
--- a/Mac/Demo/example2/dnslookup-2.py
+++ b/Mac/Demo/example2/dnslookup-2.py
@@ -1,7 +1,7 @@
 import FrameWork
 import EasyDialogs
-import Res
-import Dlg
+from Carbon import Res
+from Carbon import Dlg
 import sys
 import socket
 import string
diff --git a/Mac/Demo/imgbrowse/imgbrowse.py b/Mac/Demo/imgbrowse/imgbrowse.py
index ab9b429054..c67f4e8085 100644
--- a/Mac/Demo/imgbrowse/imgbrowse.py
+++ b/Mac/Demo/imgbrowse/imgbrowse.py
@@ -2,11 +2,11 @@
 
 import FrameWork
 import EasyDialogs
-import Res
-import Qd
-import QuickDraw
-import Win
-#import List
+from Carbon import Res
+from Carbon import Qd
+from Carbon import QuickDraw
+from Carbon import Win
+#ifrom Carbon mport List
 import sys
 import struct
 import img
diff --git a/Mac/Demo/imgbrowse/mac_image.py b/Mac/Demo/imgbrowse/mac_image.py
index 4e3881f9f4..094c58e164 100644
--- a/Mac/Demo/imgbrowse/mac_image.py
+++ b/Mac/Demo/imgbrowse/mac_image.py
@@ -1,6 +1,6 @@
 """mac_image - Helper routines (hacks) for images"""
 import imgformat
-import Qd
+from Carbon import Qd
 import time
 import struct
 import MacOS
diff --git a/Mac/Demo/mlte/mlted.py b/Mac/Demo/mlte/mlted.py
index 10d56989fd..2ae77e7862 100644
--- a/Mac/Demo/mlte/mlted.py
+++ b/Mac/Demo/mlte/mlted.py
@@ -5,15 +5,15 @@
 
 from Menu import DrawMenuBar
 from FrameWork import *
-import Win
-import Ctl
-import Qd
-import Res
-import Scrap
+from Carbon import Win
+from Carbon import Ctl
+from Carbon import Qd
+from Carbon import Res
+from Carbon import Scrap
 import os
 import macfs
-import MacTextEditor
-import Mlte
+from Carbon import MacTextEditor
+from Carbon import Mlte
 
 UNDOLABELS = [ # Indexed by MLTECanUndo() value
 	"Typing", "Cut", "Paste", "Clear", "Font Change", "Color Change", "Size Change",
diff --git a/Mac/Demo/printing/PrintingDemo.py b/Mac/Demo/printing/PrintingDemo.py
index 6f7881f4b9..a42ac2f4ab 100644
--- a/Mac/Demo/printing/PrintingDemo.py
+++ b/Mac/Demo/printing/PrintingDemo.py
@@ -1,7 +1,7 @@
 import Printing
-import Qd
-import Fm
-import Res
+from Carbon import Qd
+from Carbon import Fm
+from Carbon import Res
 
 # some constants
 PostScriptBegin = 190	# Set driver state to PostScript	
diff --git a/Mac/Demo/quicktime/MovieInWindow.py b/Mac/Demo/quicktime/MovieInWindow.py
index af9c7d7d88..9cd4e772b0 100644
--- a/Mac/Demo/quicktime/MovieInWindow.py
+++ b/Mac/Demo/quicktime/MovieInWindow.py
@@ -3,14 +3,14 @@
 Jack Jansen, CWI, December 1995
 """
 
-import Qt
-import QuickTime
-import Qd
-import QuickDraw
-import Evt
-import Events
-import Win
-import Windows
+from Carbon import Qt
+from Carbon import QuickTime
+from Carbon import Qd
+from Carbon import QuickDraw
+from Carbon import Evt
+from Carbon import Events
+from Carbon import Win
+from Carbon import Windows
 import macfs
 import sys
 
diff --git a/Mac/Demo/quicktime/VerySimplePlayer.py b/Mac/Demo/quicktime/VerySimplePlayer.py
index 3053d33a03..4962ebb854 100644
--- a/Mac/Demo/quicktime/VerySimplePlayer.py
+++ b/Mac/Demo/quicktime/VerySimplePlayer.py
@@ -3,14 +3,14 @@
 Jack Jansen, CWI, December 1995
 """
 
-import Qt
-import QuickTime
-import Qd
-import QuickDraw
-import Evt
-import Events
-import Win
-import Windows
+from Carbon import Qt
+from Carbon import QuickTime
+from Carbon import Qd
+from Carbon import QuickDraw
+from Carbon import Evt
+from Carbon import Events
+from Carbon import Win
+from Carbon import Windows
 import macfs
 import sys
 
diff --git a/Mac/Demo/resources/copyres.py b/Mac/Demo/resources/copyres.py
index b401142550..ae627efb07 100644
--- a/Mac/Demo/resources/copyres.py
+++ b/Mac/Demo/resources/copyres.py
@@ -1,5 +1,5 @@
-from Res import *
-from Resources import *
+from Carbon.Res import *
+from Carbon.Resources import *
 import MacOS
 
 READ = 1
diff --git a/Mac/Demo/resources/listres.py b/Mac/Demo/resources/listres.py
index a0b24237ee..7575db803e 100644
--- a/Mac/Demo/resources/listres.py
+++ b/Mac/Demo/resources/listres.py
@@ -1,7 +1,7 @@
 # List all resources
 
-import Res
-from Resources import *
+from Carbon import Res
+from Carbon.Resources import *
 
 def list1resources():
 	ntypes = Res.Count1Types()
diff --git a/Mac/Demo/sound/playaiff.py b/Mac/Demo/sound/playaiff.py
index 1022fc8a74..8237895250 100644
--- a/Mac/Demo/sound/playaiff.py
+++ b/Mac/Demo/sound/playaiff.py
@@ -1,5 +1,5 @@
-from Sound import *
-import Snd
+from Carbon.Sound import *
+from Carbon import Snd
 
 import aifc, audioop
 
diff --git a/Mac/Demo/textedit/ped.py b/Mac/Demo/textedit/ped.py
index 529ac12240..524b92ad32 100644
--- a/Mac/Demo/textedit/ped.py
+++ b/Mac/Demo/textedit/ped.py
@@ -5,12 +5,12 @@
 # - Handle horizontal scrollbar correctly
 # - Functionality: find, etc.
 
-from Menu import DrawMenuBar
+from Carbon.Menu import DrawMenuBar
 from FrameWork import *
-import Win
-import Qd
-import TE
-import Scrap
+from Carbon import Win
+from Carbon import Qd
+from Carbon import TE
+from Carbon import Scrap
 import os
 import macfs
 
diff --git a/Mac/Demo/waste/htmled.py b/Mac/Demo/waste/htmled.py
index 4d29e1ea9b..fc2ce5b437 100644
--- a/Mac/Demo/waste/htmled.py
+++ b/Mac/Demo/waste/htmled.py
@@ -3,15 +3,15 @@
 # To be done:
 # - Functionality: find, etc.
 
-from Menu import DrawMenuBar
+from Carbon.Menu import DrawMenuBar
 from FrameWork import *
-import Win
-import Qd
-import Res
-import Fm
+from Carbon import Win
+from Carbon import Qd
+from Carbon import Res
+from Carbon import Fm
 import waste
 import WASTEconst
-import Scrap
+from Carbon import Scrap
 import os
 import macfs
 import MACFS
diff --git a/Mac/Demo/waste/swed.py b/Mac/Demo/waste/swed.py
index e4622da2c2..e2c266657b 100644
--- a/Mac/Demo/waste/swed.py
+++ b/Mac/Demo/waste/swed.py
@@ -3,15 +3,15 @@
 # To be done:
 # - Functionality: find, etc.
 
-from Menu import DrawMenuBar
+from Carbon.Menu import DrawMenuBar
 from FrameWork import *
-import Win
-import Qd
-import Res
-import Fm
+from Carbon import Win
+from Carbon import Qd
+from Carbon import Res
+from Carbon import Fm
 import waste
 import WASTEconst
-import Scrap
+from Carbon import Scrap
 import os
 import macfs
 import MACFS
diff --git a/Mac/Demo/waste/wed.py b/Mac/Demo/waste/wed.py
index 342d52e278..00ff8d8d76 100644
--- a/Mac/Demo/waste/wed.py
+++ b/Mac/Demo/waste/wed.py
@@ -3,14 +3,14 @@
 # To be done:
 # - Functionality: find, etc.
 
-from Menu import DrawMenuBar
+from Carbon.Menu import DrawMenuBar
 from FrameWork import *
-import Win
-import Qd
-import Res
+from Carbon import Win
+from Carbon import Qd
+from Carbon import Res
 import waste
 import WASTEconst
-import Scrap
+from Carbon import Scrap
 import os
 import macfs