Trying again to check it in. Changes to:
- Use Universal Headers as input
- Change addpack calls to not depend on Guido's disklayout
- Checkge testprograms to use new names for some functions
diff --git a/Mac/Lib/test/tmenu.py b/Mac/Lib/test/tmenu.py
index 1b156d7..bc972a8 100644
--- a/Mac/Lib/test/tmenu.py
+++ b/Mac/Lib/test/tmenu.py
@@ -2,12 +2,19 @@
import os
from Menu import *
-
-# Since we can't (yet) list the mounted volumes, here's a list of some:
-my_volumes = ['C:', 'D:', 'E:', 'F:']
+import macfs
+import sys
def main():
global oldbar
+ my_volumes = []
+ while 1:
+ fss, ok = macfs.GetDirectory()
+ if not ok:
+ break
+ my_volumes.append(fss.as_pathname())
+ if not my_volumes:
+ return
oldbar = GetMenuBar()
ClearMenuBar()
makevolmenus(my_volumes)
@@ -40,10 +47,10 @@
for file in files:
item = item+1
menu.AppendMenu('x') # add a dummy string
- menu.SetItem(item, file) # set the actual text
+ menu.SetMenuItemText(item, file) # set the actual text
fullname = os.path.join(dir, file)
if os.path.isdir(fullname):
- menu.SetItem(item, ':' + file + ':') # append colons
+ menu.SetMenuItemText(item, ':' + file + ':') # append colons
if maxdepth > 0:
id = nextid()
submenu = NewMenu(id, fullname)
@@ -58,3 +65,4 @@
if __name__ == '__main__':
main()
+ sys.exit(1) # To allow the user to interact...
diff --git a/Mac/Lib/toolbox/Events.py b/Mac/Lib/toolbox/Events.py
index 943c9e5..3d4ff94 100644
--- a/Mac/Lib/toolbox/Events.py
+++ b/Mac/Lib/toolbox/Events.py
@@ -1,4 +1,4 @@
-# Generated from 'D:Development:THINK C:Mac #includes:Apple #includes:Events.h'
+# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Events.h'
nullEvent = 0
mouseDown = 1
@@ -10,41 +10,41 @@
diskEvt = 7
activateEvt = 8
osEvt = 15
-mDownMask = 2
-mUpMask = 4
-keyDownMask = 8
-keyUpMask = 16
-autoKeyMask = 32
-updateMask = 64
-diskMask = 128
-activMask = 256
-highLevelEventMask = 1024
-osMask = -32768
-everyEvent = -1
+mDownMask = 0x0002
+mUpMask = 0x0004
+keyDownMask = 0x0008
+keyUpMask = 0x0010
+autoKeyMask = 0x0020
+updateMask = 0x0040
+diskMask = 0x0080
+activMask = 0x0100
+highLevelEventMask = 0x0400
+osMask = 0x8000
+everyEvent = 0xFFFF
charCodeMask = 0x000000FF
keyCodeMask = 0x0000FF00
adbAddrMask = 0x00FF0000
-osEvtMessageMask = 0xFF000000
-mouseMovedMessage = 0xFA
-suspendResumeMessage = 0x01
+osEvtMessageMask = 0xFF000000L
+mouseMovedMessage = 0x00FA
+suspendResumeMessage = 0x0001
resumeFlag = 1
convertClipboardFlag = 2
-activeFlag = 1
-btnState = 128
-cmdKey = 256
-shiftKey = 512
-alphaLock = 1024
-optionKey = 2048
-controlKey = 4096
+activeFlag = 0x0001
+btnState = 0x0080
+cmdKey = 0x0100
+shiftKey = 0x0200
+alphaLock = 0x0400
+optionKey = 0x0800
+controlKey = 0x1000
networkEvt = 10
driverEvt = 11
app1Evt = 12
app2Evt = 13
app3Evt = 14
app4Evt = 15
-networkMask = 1024
-driverMask = 2048
-app1Mask = 4096
-app2Mask = 8192
-app3Mask = 16384
-app4Mask = -32768
+networkMask = 0x0400
+driverMask = 0x0800
+app1Mask = 0x1000
+app2Mask = 0x2000
+app3Mask = 0x4000
+app4Mask = 0x8000
diff --git a/Mac/Lib/toolbox/Menus.py b/Mac/Lib/toolbox/Menus.py
index 59dc89a..3729810 100644
--- a/Mac/Lib/toolbox/Menus.py
+++ b/Mac/Lib/toolbox/Menus.py
@@ -1,5 +1,6 @@
-# Generated from 'D:Development:THINK C:Mac #includes:Apple #includes:Menus.h'
+# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Menus.h'
+noMark = 0
mDrawMsg = 0
mChooseMsg = 1
mSizeMsg = 2
@@ -11,4 +12,3 @@
mPopUpMsg = 3
mctAllItems = -98
mctLastIDIndic = -99
-
diff --git a/Mac/Lib/toolbox/QuickDraw.py b/Mac/Lib/toolbox/QuickDraw.py
index b09628f..e0a8ff1 100644
--- a/Mac/Lib/toolbox/QuickDraw.py
+++ b/Mac/Lib/toolbox/QuickDraw.py
@@ -1,4 +1,4 @@
-# Generated from 'D:Development:THINK C:Mac #includes:Apple #includes:QuickDraw.h'
+# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:QuickDraw.h'
invalColReq = -1
srcCopy = 0
@@ -47,18 +47,12 @@
yellowColor = 69
picLParen = 0
picRParen = 1
-normal = 0
-bold = 1
-italic = 2
-underline = 4
-outline = 8
-shadow = 0x10
-condense = 0x20
-extend = 0x40
clutType = 0
fixedType = 1
directType = 2
gdDevType = 0
+roundedDevice = 5
+hasAuxMenuBar = 6
burstDevice = 7
ext32Device = 8
ramInit = 10
@@ -72,6 +66,28 @@
defQDColors = 127
RGBDirect = 16
baseAddr32 = 4
-rgnOverflowErr = -147
-insufficientStackErr = -149
+singleDevicesBit = 0
+dontMatchSeedsBit = 1
+allDevicesBit = 2
+singleDevices = 1 << singleDevicesBit
+dontMatchSeeds = 1 << dontMatchSeedsBit
allDevices = 1 << allDevicesBit
+kNoConstraint = 0
+kVerticalConstraint = 1
+kHorizontalConstraint = 2
+# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:QuickDrawText.h'
+
+leftCaret = 0
+rightCaret = -1
+hilite = 1
+smLeftCaret = 0
+smRightCaret = -1
+smHilite = 1
+onlyStyleRun = 0
+leftStyleRun = 1
+rightStyleRun = 2
+middleStyleRun = 3
+smOnlyStyleRun = 0
+smLeftStyleRun = 1
+smRightStyleRun = 2
+smMiddleStyleRun = 3
diff --git a/Mac/Lib/toolbox/Resources.py b/Mac/Lib/toolbox/Resources.py
index e2ed97a..7d51d6d 100644
--- a/Mac/Lib/toolbox/Resources.py
+++ b/Mac/Lib/toolbox/Resources.py
@@ -1,4 +1,4 @@
-# Generated from 'D:Development:THINK C:Mac #includes:Apple #includes:Resources.h'
+# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Resources.h'
resSysHeap = 64
resPurgeable = 32
@@ -9,5 +9,5 @@
mapReadOnly = 128
mapCompact = 64
mapChanged = 32
-mapTrue = 0xFFFF
-mapFalse = 0xFF00
+kResFileNotOpened = -1
+kSystemResFile = 0
diff --git a/Mac/Lib/toolbox/Sound.py b/Mac/Lib/toolbox/Sound.py
index a65c652..515d024 100644
--- a/Mac/Lib/toolbox/Sound.py
+++ b/Mac/Lib/toolbox/Sound.py
@@ -1,15 +1,20 @@
-# Generated from 'D:Development:THINK C:Mac #includes:Apple #includes:Sound.h'
+# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Sound.h'
-swMode = -1
-ftMode = 1
-ffMode = 0
-rate22khz = 0x56EE8BA3
-rate11khz = 0x2B7745D1
+soundListRsrc = 'snd '
+rate44khz = 0xAC440000L
+rate22050hz = 0x56220000L
+rate22khz = 0x56EE8BA3L
+rate11khz = 0x2B7745D1L
+rate11025hz = 0x2B110000
squareWaveSynth = 1
waveTableSynth = 3
sampledSynth = 5
MACE3snthID = 11
MACE6snthID = 13
+kMiddleC = 60
+kSimpleBeepID = 1
+kFullVolume = 0x0100
+kNoVolume = 0
nullCmd = 0
initCmd = 1
freeCmd = 2
@@ -21,23 +26,18 @@
resumeCmd = 12
callBackCmd = 13
syncCmd = 14
-emptyCmd = 15
-tickleCmd = 20
-requestNextCmd = 21
-howOftenCmd = 22
-wakeUpCmd = 23
availableCmd = 24
versionCmd = 25
totalLoadCmd = 26
loadCmd = 27
-scaleCmd = 30
-tempoCmd = 31
freqDurationCmd = 40
restCmd = 41
freqCmd = 42
ampCmd = 43
timbreCmd = 44
getAmpCmd = 45
+volumeCmd = 46
+getVolumeCmd = 47
waveTableCmd = 60
phaseCmd = 61
soundCmd = 80
@@ -46,6 +46,8 @@
continueCmd = 83
doubleBufferCmd = 84
getRateCmd = 85
+rateMultiplierCmd = 86
+getRateMultiplierCmd = 87
sizeCmd = 90
convertCmd = 91
stdQLength = 128
@@ -55,10 +57,6 @@
waveInitChannel1 = 0x05
waveInitChannel2 = 0x06
waveInitChannel3 = 0x07
-initPanMask = 0x0003
-initSRateMask = 0x0030
-initStereoMask = 0x00C0
-initCompMask = 0xFF00
initChanLeft = 0x0002
initChanRight = 0x0003
initNoInterp = 0x0004
@@ -67,18 +65,21 @@
initStereo = 0x00C0
initMACE3 = 0x0300
initMACE6 = 0x0400
-initChan0 = 0x0004
-initChan1 = 0x0005
-initChan2 = 0x0006
-initChan3 = 0x0007
-stdSH = 0x00
-extSH = 0xFF
-cmpSH = 0xFE
+initPanMask = 0x0003
+initSRateMask = 0x0030
+initStereoMask = 0x00C0
+initCompMask = 0xFF00
+kUseOptionalOutputDevice = -1
notCompressed = 0
+fixedCompression = -1
+variableCompression = -2
twoToOne = 1
eightToThree = 2
threeToOne = 3
sixToOne = 4
+stdSH = 0x00
+extSH = 0xFF
+cmpSH = 0xFE
outsideCmpSH = 0
insideCmpSH = 1
aceSuccess = 0
diff --git a/Mac/Lib/toolbox/Windows.py b/Mac/Lib/toolbox/Windows.py
index 037000f..9a615cd 100644
--- a/Mac/Lib/toolbox/Windows.py
+++ b/Mac/Lib/toolbox/Windows.py
@@ -1,4 +1,4 @@
-# Generated from 'D:Development:THINK C:Mac #includes:Apple #includes:Windows.h'
+# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Windows.h'
documentProc = 0
dBoxProc = 1
@@ -9,6 +9,14 @@
zoomDocProc = 8
zoomNoGrow = 12
rDocProc = 16
+floatProc = 1985
+floatGrowProc = 1987
+floatZoomProc = 1989
+floatZoomGrowProc = 1991
+floatSideProc = 1993
+floatSideGrowProc = 1995
+floatSideZoomProc = 1997
+floatSideZoomGrowProc = 1999
dialogKind = 2
userKind = 8
inDesk = 0
@@ -27,6 +35,12 @@
wDispose = 4
wGrow = 5
wDrawGIcon = 6
+deskPatID = 16
+wContentColor = 0
+wFrameColor = 1
+wTextColor = 2
+wHiliteColor = 3
+wTitleBarColor = 4
wNoHit = 0
wInContent = 1
wInDrag = 2
@@ -34,9 +48,3 @@
wInGoAway = 4
wInZoomIn = 5
wInZoomOut = 6
-deskPatID = 16
-wContentColor = 0
-wFrameColor = 1
-wTextColor = 2
-wHiliteColor = 3
-wTitleBarColor = 4