Ported to Universal Header 2.0.1f (i.e. CW6)
diff --git a/Mac/Lib/toolbox/AppleEvents.py b/Mac/Lib/toolbox/AppleEvents.py
index 5114c72..272c446 100644
--- a/Mac/Lib/toolbox/AppleEvents.py
+++ b/Mac/Lib/toolbox/AppleEvents.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:AppleEvents.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:AppleEvents.h'
typeBoolean = 'bool'
typeChar = 'TEXT'
diff --git a/Mac/Lib/toolbox/Controls.py b/Mac/Lib/toolbox/Controls.py
index af1747f..5ebe9c4 100644
--- a/Mac/Lib/toolbox/Controls.py
+++ b/Mac/Lib/toolbox/Controls.py
@@ -1,11 +1,26 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Controls.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Controls.h'
pushButProc = 0
checkBoxProc = 1
radioButProc = 2
scrollBarProc = 16
popupMenuProc = 1008
+kControlUsesOwningWindowsFontVariant = 1 << 3
useWFont = 8
+kControlNoPart = 0
+kControlLabelPart = 1
+kControlMenuPart = 2
+kControlTrianglePart = 4
+kControlButtonPart = 10
+kControlCheckBoxPart = 11
+kControlRadioButtonPart = 11
+kControlUpButtonPart = 20
+kControlDownButtonPart = 21
+kControlPageUpPart = 22
+kControlPageDownPart = 23
+kControlIndicatorPart = 129
+kControlDisabledPart = 254
+kControlInactivePart = 255
inLabel = 1
inMenu = 2
inTriangle = 4
@@ -16,19 +31,12 @@
inPageUp = 22
inPageDown = 23
inThumb = 129
-kNoHiliteControlPart = 0
-kInLabelControlPart = 1
-kInMenuControlPart = 2
-kInTriangleControlPart = 4
-kInButtonControlPart = 10
-kInCheckBoxControlPart = 11
-kInUpButtonControlPart = 20
-kInDownButtonControlPart = 21
-kInPageUpControlPart = 22
-kInPageDownControlPart = 23
-kInIndicatorControlPart = 129
-kReservedControlPart = 254
-kControlInactiveControlPart = 255
+kControlCheckboxUncheckedValue = 0
+kControlCheckboxCheckedValue = 1
+kControlCheckboxMixedValue = 2
+kControlRadioButtonUncheckedValue = 0
+kControlRadioButtonCheckedValue = 1
+kControlRadioButtonMixedValue = 2
popupFixedWidth = 1 << 0
popupVariableWidth = 1 << 1
popupUseAddResMenu = 1 << 2
@@ -46,6 +54,10 @@
popupTitleRightJust = 0x000000FF
hAxisOnly = 1
vAxisOnly = 2
+cFrameColor = 0
+cBodyColor = 1
+cTextColor = 2
+cThumbColor = 3
drawCntl = 0
testCntl = 1
calcCRgns = 2
@@ -58,7 +70,19 @@
calcCntlRgn = 10
calcThumbRgn = 11
drawThumbOutline = 12
-cFrameColor = 0
-cBodyColor = 1
-cTextColor = 2
-cThumbColor = 3
+kDrawControlEntireControl = 0
+kDrawControlIndicatorOnly = 129
+kDragControlEntireControl = 0
+kNoHiliteControlPart = 0
+kInLabelControlPart = 1
+kInMenuControlPart = 2
+kInTriangleControlPart = 4
+kInButtonControlPart = 10
+kInCheckBoxControlPart = 11
+kInUpButtonControlPart = 20
+kInDownButtonControlPart = 21
+kInPageUpControlPart = 22
+kInPageDownControlPart = 23
+kInIndicatorControlPart = 129
+kReservedControlPart = 254
+kControlInactiveControlPart = 255
diff --git a/Mac/Lib/toolbox/Dialogs.py b/Mac/Lib/toolbox/Dialogs.py
index 66fea6b..572c609 100644
--- a/Mac/Lib/toolbox/Dialogs.py
+++ b/Mac/Lib/toolbox/Dialogs.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Dialogs.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Dialogs.h'
ctrlItem = 4
btnCtrl = 0
@@ -16,7 +16,6 @@
stopIcon = 0
noteIcon = 1
cautionIcon = 2
-kIDODialogItem = 24
overlayDITL = 0
appendDITLRight = 1
appendDITLBottom = 2
diff --git a/Mac/Lib/toolbox/Events.py b/Mac/Lib/toolbox/Events.py
index 3d4ff94..0ff095a 100644
--- a/Mac/Lib/toolbox/Events.py
+++ b/Mac/Lib/toolbox/Events.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Events.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Events.h'
nullEvent = 0
mouseDown = 1
@@ -36,6 +36,9 @@
alphaLock = 0x0400
optionKey = 0x0800
controlKey = 0x1000
+rightShiftKey = 0x2000
+rightOptionKey = 0x4000
+rightControlKey = 0x8000
networkEvt = 10
driverEvt = 11
app1Evt = 12
diff --git a/Mac/Lib/toolbox/Menus.py b/Mac/Lib/toolbox/Menus.py
index 3729810..c063ab5 100644
--- a/Mac/Lib/toolbox/Menus.py
+++ b/Mac/Lib/toolbox/Menus.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Menus.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Menus.h'
noMark = 0
mDrawMsg = 0
diff --git a/Mac/Lib/toolbox/QuickDraw.py b/Mac/Lib/toolbox/QuickDraw.py
index e0a8ff1..f9a6b8c 100644
--- a/Mac/Lib/toolbox/QuickDraw.py
+++ b/Mac/Lib/toolbox/QuickDraw.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:QuickDraw.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:QuickDraw.h'
invalColReq = -1
srcCopy = 0
@@ -18,6 +18,7 @@
notPatXor = 14
notPatBic = 15
grayishTextOr = 49
+hilitetransfermode = 50
blend = 32
addPin = 33
addOver = 34
@@ -28,6 +29,12 @@
adMin = 39
ditherCopy = 64
transparent = 36
+italicBit = 1
+ulineBit = 2
+outlineBit = 3
+shadowBit = 4
+condenseBit = 5
+extendBit = 6
normalBit = 0
inverseBit = 1
redBit = 4
@@ -75,7 +82,7 @@
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'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:QuickDrawText.h'
leftCaret = 0
rightCaret = -1
diff --git a/Mac/Lib/toolbox/Resources.py b/Mac/Lib/toolbox/Resources.py
index 7d51d6d..1c4d890 100644
--- a/Mac/Lib/toolbox/Resources.py
+++ b/Mac/Lib/toolbox/Resources.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Resources.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Resources.h'
resSysHeap = 64
resPurgeable = 32
diff --git a/Mac/Lib/toolbox/Sound.py b/Mac/Lib/toolbox/Sound.py
index 515d024..f7216c5 100644
--- a/Mac/Lib/toolbox/Sound.py
+++ b/Mac/Lib/toolbox/Sound.py
@@ -1,4 +1,4 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Sound.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Sound.h'
soundListRsrc = 'snd '
rate44khz = 0xAC440000L
diff --git a/Mac/Lib/toolbox/Windows.py b/Mac/Lib/toolbox/Windows.py
index 9a615cd..ca6f602 100644
--- a/Mac/Lib/toolbox/Windows.py
+++ b/Mac/Lib/toolbox/Windows.py
@@ -1,5 +1,11 @@
-# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Windows.h'
+# Generated from 'Moes:CodeWarrior6:Metrowerks C/C++:Headers:Universal Headers 2.0.1f:Windows.h'
+kStandardWindowDefinition = 0
+kRoundWindowDefinition = 1
+kFloatingWindowDefinition = 124
+kModalDialogVariantCode = 1
+kMovableModalDialogVariantCode = 5
+kSideFloaterVariantCode = 8
documentProc = 0
dBoxProc = 1
plainDBox = 2
@@ -19,6 +25,8 @@
floatSideZoomGrowProc = 1999
dialogKind = 2
userKind = 8
+kDialogWindowKind = 2
+kApplicationWindowKind = 8
inDesk = 0
inMenuBar = 1
inSysWindow = 2
@@ -36,11 +44,6 @@
wGrow = 5
wDrawGIcon = 6
deskPatID = 16
-wContentColor = 0
-wFrameColor = 1
-wTextColor = 2
-wHiliteColor = 3
-wTitleBarColor = 4
wNoHit = 0
wInContent = 1
wInDrag = 2
@@ -48,3 +51,8 @@
wInGoAway = 4
wInZoomIn = 5
wInZoomOut = 6
+wContentColor = 0
+wFrameColor = 1
+wTextColor = 2
+wHiliteColor = 3
+wTitleBarColor = 4