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

1 files changed, 29 insertions, 7 deletions

diff --git a/Mac/Lib/toolbox/Controls.py b/Mac/Lib/toolbox/Controls.py
index 0686580..af1747f 100644
--- a/Mac/Lib/toolbox/Controls.py
+++ b/Mac/Lib/toolbox/Controls.py
@@ -1,10 +1,14 @@
-# Generated from 'D:Development:THINK C:Mac #includes:Apple #includes:Controls.h'
+# Generated from 'Moes:CW5 GOLD \304:Metrowerks C/C++ \304:Headers \304:Universal Headers 2.0a3 \304:Controls.h'
 
 pushButProc = 0
 checkBoxProc = 1
 radioButProc = 2
-useWFont = 8
 scrollBarProc = 16
+popupMenuProc = 1008
+useWFont = 8
+inLabel = 1
+inMenu = 2
+inTriangle = 4
 inButton = 10
 inCheckBox = 11
 inUpButton = 20
@@ -12,17 +16,34 @@ inDownButton = 21
 inPageUp = 22
 inPageDown = 23
 inThumb = 129
-popupMenuProc = 1008
-inLabel = 1
-inMenu = 2
-inTriangle = 4
+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
+popupFixedWidth = 1 << 0
+popupVariableWidth = 1 << 1
+popupUseAddResMenu = 1 << 2
 popupUseWFont = 1 << 3
+popupTitleBold = 1 << 8
+popupTitleItalic = 1 << 9
+popupTitleUnderline = 1 << 10
 popupTitleOutline = 1 << 11
+popupTitleShadow = 1 << 12
+popupTitleCondense = 1 << 13
 popupTitleExtend = 1 << 14
+popupTitleNoStyle = 1 << 15
 popupTitleLeftJust = 0x00000000
 popupTitleCenterJust = 0x00000001
 popupTitleRightJust = 0x000000FF
-noConstraint = 0
 hAxisOnly = 1
 vAxisOnly = 2
 drawCntl = 0
@@ -36,6 +57,7 @@ dragCntl = 7
 autoTrack = 8
 calcCntlRgn = 10
 calcThumbRgn = 11
+drawThumbOutline = 12
 cFrameColor = 0
 cBodyColor = 1
 cTextColor = 2