[Python-checkins] CVS: python/dist/src/Mac/Lib/Carbon Controls.py,1.1,1.2

Just van Rossum jvr@users.sourceforge.net
Wed, 12 Dec 2001 14:40:29 -0800


Update of /cvsroot/python/python/dist/src/Mac/Lib/Carbon
In directory usw-pr-cvs1:/tmp/cvs-serv21063

Modified Files:
	Controls.py 
Log Message:
Updated for Universal Headers 3.4.

Index: Controls.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/Carbon/Controls.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Controls.py	2001/08/19 22:11:18	1.1
--- Controls.py	2001/12/12 22:40:27	1.2
***************
*** 5,8 ****
--- 5,13 ----
  from QuickDraw import *
  from Dragconst import *
+ from CarbonEvents import *
+ from Appearance import *
+ kDataBrowserItemAnyState = -1
+ kControlBevelButtonCenterPopupGlyphTag = -1
+ kDataBrowserClientPropertyFlagsMask = 0xFF << 24  # kDataBrowserClientPropertyFlagsOffset
  
  kControlDefProcType = FOUR_CHAR_CODE('CDEF')
***************
*** 13,23 ****
  controlNotifyClick = FOUR_CHAR_CODE('clik')
  controlNotifyFocus = FOUR_CHAR_CODE('focu')
! controlNotifyKey = FOUR_CHAR_CODE('key ')        
! kControlCanAutoInvalidate = 1L << 0                       
  staticTextProc = 256
  editTextProc = 272
  iconProc = 288
  userItemProc = 304
! pictItemProc = 320                           
  cFrameColor = 0
  cBodyColor = 1
--- 18,28 ----
  controlNotifyClick = FOUR_CHAR_CODE('clik')
  controlNotifyFocus = FOUR_CHAR_CODE('focu')
! controlNotifyKey = FOUR_CHAR_CODE('key ') 
! kControlCanAutoInvalidate = 1L << 0 
  staticTextProc = 256
  editTextProc = 272
  iconProc = 288
  userItemProc = 304
! pictItemProc = 320   
  cFrameColor = 0
  cBodyColor = 1
***************
*** 26,30 ****
  kNumberCtlCTabEntries = 4
  kControlNoVariant = 0
! kControlUsesOwningWindowsFontVariant = 1 << 3               
  kControlNoPart = 0
  kControlIndicatorPart = 129
--- 31,35 ----
  kNumberCtlCTabEntries = 4
  kControlNoVariant = 0
! kControlUsesOwningWindowsFontVariant = 1 << 3 
  kControlNoPart = 0
  kControlIndicatorPart = 129
***************
*** 36,40 ****
  kControlFocusNoPart = 0
  kControlFocusNextPart = -1
! kControlFocusPrevPart = -2                            
  kControlCollectionTagBounds = FOUR_CHAR_CODE('boun')
  kControlCollectionTagValue = FOUR_CHAR_CODE('valu')
--- 41,45 ----
  kControlFocusNoPart = 0
  kControlFocusNextPart = -1
! kControlFocusPrevPart = -2    
  kControlCollectionTagBounds = FOUR_CHAR_CODE('boun')
  kControlCollectionTagValue = FOUR_CHAR_CODE('valu')
***************
*** 45,52 ****
  kControlCollectionTagRefCon = FOUR_CHAR_CODE('refc')
  kControlCollectionTagTitle = FOUR_CHAR_CODE('titl')
  kControlCollectionTagIDSignature = FOUR_CHAR_CODE('idsi')
  kControlCollectionTagIDID = FOUR_CHAR_CODE('idid')
! kControlCollectionTagCommand = FOUR_CHAR_CODE('cmd ')       
! kControlCollectionTagSubControls = FOUR_CHAR_CODE('subc')   
  kControlContentTextOnly = 0
  kControlNoContent = 0
--- 50,59 ----
  kControlCollectionTagRefCon = FOUR_CHAR_CODE('refc')
  kControlCollectionTagTitle = FOUR_CHAR_CODE('titl')
+ kControlCollectionTagUnicodeTitle = FOUR_CHAR_CODE('uttl')
  kControlCollectionTagIDSignature = FOUR_CHAR_CODE('idsi')
  kControlCollectionTagIDID = FOUR_CHAR_CODE('idid')
! kControlCollectionTagCommand = FOUR_CHAR_CODE('cmd ')
! kControlCollectionTagVarCode = FOUR_CHAR_CODE('varc') 
! kControlCollectionTagSubControls = FOUR_CHAR_CODE('subc') 
  kControlContentTextOnly = 0
  kControlNoContent = 0
***************
*** 66,70 ****
  kControlFontSmallSystemFont = -2
  kControlFontSmallBoldSystemFont = -3
! kControlFontViewSystemFont = -4                            
  kControlUseFontMask = 0x0001
  kControlUseFaceMask = 0x0002
--- 73,77 ----
  kControlFontSmallSystemFont = -2
  kControlFontSmallBoldSystemFont = -3
! kControlFontViewSystemFont = -4    
  kControlUseFontMask = 0x0001
  kControlUseFaceMask = 0x0002
***************
*** 76,86 ****
  kControlUseAllMask = 0x00FF
  kControlAddFontSizeMask = 0x0100
! kControlAddToMetaFontMask = 0x0200                        
  kDoNotActivateAndIgnoreClick = 0
  kDoNotActivateAndHandleClick = 1
  kActivateAndIgnoreClick = 2
! kActivateAndHandleClick = 3                             
  kControlFontStyleTag = FOUR_CHAR_CODE('font')
  kControlKeyFilterTag = FOUR_CHAR_CODE('fltr')
  kControlSupportsGhosting = 1 << 0
  kControlSupportsEmbedding = 1 << 1
--- 83,96 ----
  kControlUseAllMask = 0x00FF
  kControlAddFontSizeMask = 0x0100
! kControlAddToMetaFontMask = 0x0200 
! kControlUseThemeFontIDMask = 0x0080 
  kDoNotActivateAndIgnoreClick = 0
  kDoNotActivateAndHandleClick = 1
  kActivateAndIgnoreClick = 2
! kActivateAndHandleClick = 3     
  kControlFontStyleTag = FOUR_CHAR_CODE('font')
  kControlKeyFilterTag = FOUR_CHAR_CODE('fltr')
+ kControlKindTag = FOUR_CHAR_CODE('kind')
+ kControlSizeTag = FOUR_CHAR_CODE('size')
  kControlSupportsGhosting = 1 << 0
  kControlSupportsEmbedding = 1 << 1
***************
*** 101,105 ****
  kControlSupportsSetCursor = 1 << 20
  kControlSupportsContextualMenus = 1 << 21
! kControlSupportsClickActivation = 1 << 22                   
  drawCntl = 0
  testCntl = 1
--- 111,116 ----
  kControlSupportsSetCursor = 1 << 20
  kControlSupportsContextualMenus = 1 << 21
! kControlSupportsClickActivation = 1 << 22
! kControlIdlesWithTimer = 1 << 23 
  drawCntl = 0
  testCntl = 1
***************
*** 140,144 ****
  kControlMsgDisplayDebugInfo = 46
  kControlMsgContextualMenuClick = 47
! kControlMsgGetClickActivation = 48                          
  kDrawControlEntireControl = 0
  kDrawControlIndicatorOnly = 129
--- 151,159 ----
  kControlMsgDisplayDebugInfo = 46
  kControlMsgContextualMenuClick = 47
! kControlMsgGetClickActivation = 48    
! kControlSizeNormal = 0
! kControlSizeSmall = 1
! kControlSizeLarge = 2
! kControlSizeAuto = 0xFFFF
  kDrawControlEntireControl = 0
  kDrawControlIndicatorOnly = 129
***************
*** 151,159 ****
  hAxisOnly = 1
  vAxisOnly = 2
! kControlDefProcPtr = 0                             
! kControlPropertyPersistent = 0x00000001                    
! kDragTrackingEnterControl = kDragTrackingEnterWindow
! kDragTrackingInControl = kDragTrackingInWindow
! kDragTrackingLeaveControl = kDragTrackingLeaveWindow
  useWFont = kControlUsesOwningWindowsFontVariant
  inThumb = kControlIndicatorPart
--- 166,176 ----
  hAxisOnly = 1
  vAxisOnly = 2
! kControlDefProcPtr = 0
! kControlDefObjectClass = 1     
! kControlKindSignatureApple = FOUR_CHAR_CODE('appl')
! kControlPropertyPersistent = 0x00000001 
! kDragTrackingEnterControl = 2
! kDragTrackingInControl = 3
! kDragTrackingLeaveControl = 4
  useWFont = kControlUsesOwningWindowsFontVariant
  inThumb = kControlIndicatorPart
***************
*** 163,167 ****
  kControlInactiveControlPart = kControlInactivePart
  kControlTabListResType = FOUR_CHAR_CODE('tab#')
! kControlListDescResType = FOUR_CHAR_CODE('ldes')        
  kControlCheckBoxUncheckedValue = 0
  kControlCheckBoxCheckedValue = 1
--- 180,184 ----
  kControlInactiveControlPart = kControlInactivePart
  kControlTabListResType = FOUR_CHAR_CODE('tab#')
! kControlListDescResType = FOUR_CHAR_CODE('ldes') 
  kControlCheckBoxUncheckedValue = 0
  kControlCheckBoxCheckedValue = 1
***************
*** 213,217 ****
  kControlClockAMPMPart = 12
  kControlDataBrowserPart = 24
! kControlDataBrowserDraggedPart = 25                         
  kControlBevelButtonSmallBevelProc = 32
  kControlBevelButtonNormalBevelProc = 33
--- 230,234 ----
  kControlClockAMPMPart = 12
  kControlDataBrowserPart = 24
! kControlDataBrowserDraggedPart = 25   
  kControlBevelButtonSmallBevelProc = 32
  kControlBevelButtonNormalBevelProc = 33
***************
*** 230,236 ****
  kControlBehaviorMultiValueMenu = 0x4000
  kControlBehaviorOffsetContents = 0x8000
! kControlBehaviorCommandMenu = 0x2000                        
  kControlBevelButtonMenuOnBottom = 0
  kControlBevelButtonMenuOnRight = (1 << 2)
  kControlBevelButtonAlignSysDirection = -1
  kControlBevelButtonAlignCenter = 0
--- 247,254 ----
  kControlBehaviorMultiValueMenu = 0x4000
  kControlBehaviorOffsetContents = 0x8000
! kControlBehaviorCommandMenu = 0x2000 
  kControlBevelButtonMenuOnBottom = 0
  kControlBevelButtonMenuOnRight = (1 << 2)
+ kControlKindBevelButton = FOUR_CHAR_CODE('bevl')
  kControlBevelButtonAlignSysDirection = -1
  kControlBevelButtonAlignCenter = 0
***************
*** 262,269 ****
  kControlBevelButtonMenuValueTag = FOUR_CHAR_CODE('mval')
  kControlBevelButtonMenuHandleTag = FOUR_CHAR_CODE('mhnd')
! # kControlBevelButtonCenterPopupGlyphTag = FOUR_CHAR_CODE('pglc') 
  kControlBevelButtonLastMenuTag = FOUR_CHAR_CODE('lmnu')
! kControlBevelButtonMenuDelayTag = FOUR_CHAR_CODE('mdly')    
! kControlBevelButtonScaleIconTag = FOUR_CHAR_CODE('scal')    
  kControlSliderProc = 48
  kControlSliderLiveFeedback = (1 << 0)
--- 280,290 ----
  kControlBevelButtonMenuValueTag = FOUR_CHAR_CODE('mval')
  kControlBevelButtonMenuHandleTag = FOUR_CHAR_CODE('mhnd')
! kControlBevelButtonMenuRefTag = FOUR_CHAR_CODE('mhnd')
! kControlBevelButtonOwnedMenuRefTag = FOUR_CHAR_CODE('omrf')
! # kControlBevelButtonCenterPopupGlyphTag = FOUR_CHAR_CODE('pglc')
! kControlBevelButtonKindTag = FOUR_CHAR_CODE('bebk') 
  kControlBevelButtonLastMenuTag = FOUR_CHAR_CODE('lmnu')
! kControlBevelButtonMenuDelayTag = FOUR_CHAR_CODE('mdly') 
! kControlBevelButtonScaleIconTag = FOUR_CHAR_CODE('scal') 
  kControlSliderProc = 48
  kControlSliderLiveFeedback = (1 << 0)
***************
*** 271,283 ****
  kControlSliderReverseDirection = (1 << 2)
  kControlSliderNonDirectional = (1 << 3)
  kControlTriangleProc = 64
  kControlTriangleLeftFacingProc = 65
  kControlTriangleAutoToggleProc = 66
  kControlTriangleLeftFacingAutoToggleProc = 67
! kControlTriangleLastValueTag = FOUR_CHAR_CODE('last')       
  kControlProgressBarProc = 80
! # kControlProgressBarIndeterminateTag = FOUR_CHAR_CODE('inde') 
  kControlLittleArrowsProc = 96
  kControlChasingArrowsProc = 112
  kControlTabLargeProc = 128
  kControlTabSmallProc = 129
--- 292,319 ----
  kControlSliderReverseDirection = (1 << 2)
  kControlSliderNonDirectional = (1 << 3)
+ kControlSliderPointsDownOrRight = 0
+ kControlSliderPointsUpOrLeft = 1
+ kControlSliderDoesNotPoint = 2
+ kControlKindSlider = FOUR_CHAR_CODE('sldr')
  kControlTriangleProc = 64
  kControlTriangleLeftFacingProc = 65
  kControlTriangleAutoToggleProc = 66
  kControlTriangleLeftFacingAutoToggleProc = 67
! kControlDisclosureTrianglePointDefault = 0
! kControlDisclosureTrianglePointRight = 1
! kControlDisclosureTrianglePointLeft = 2
! kControlKindDisclosureTriangle = FOUR_CHAR_CODE('dist')
! kControlTriangleLastValueTag = FOUR_CHAR_CODE('last') 
  kControlProgressBarProc = 80
! kControlRelevanceBarProc = 81
! kControlKindProgressBar = FOUR_CHAR_CODE('prgb')
! kControlKindRelevanceBar = FOUR_CHAR_CODE('relb')
! kControlProgressBarIndeterminateTag = FOUR_CHAR_CODE('inde')
! kControlProgressBarAnimatingTag = FOUR_CHAR_CODE('anim') 
  kControlLittleArrowsProc = 96
+ kControlKindLittleArrows = FOUR_CHAR_CODE('larr')
  kControlChasingArrowsProc = 112
+ kControlKindChasingArrows = FOUR_CHAR_CODE('carr')
+ kControlChasingArrowsAnimatingTag = FOUR_CHAR_CODE('anim') 
  kControlTabLargeProc = 128
  kControlTabSmallProc = 129
***************
*** 289,299 ****
  kControlTabSmallEastProc = 133
  kControlTabLargeWestProc = 134
! kControlTabSmallWestProc = 135                           
  kControlTabContentRectTag = FOUR_CHAR_CODE('rect')
  kControlTabEnabledFlagTag = FOUR_CHAR_CODE('enab')
! kControlTabFontStyleTag = kControlFontStyleTag          
! kControlTabInfoTag = FOUR_CHAR_CODE('tabi')        
  kControlTabInfoVersionZero = 0
  kControlSeparatorLineProc = 144
  kControlGroupBoxTextTitleProc = 160
  kControlGroupBoxCheckBoxProc = 161
--- 325,345 ----
  kControlTabSmallEastProc = 133
  kControlTabLargeWestProc = 134
! kControlTabSmallWestProc = 135   
! kControlTabDirectionNorth = 0
! kControlTabDirectionSouth = 1
! kControlTabDirectionEast = 2
! kControlTabDirectionWest = 3
! kControlTabSizeLarge = kControlSizeNormal
! kControlTabSizeSmall = kControlSizeSmall
! kControlKindTabs = FOUR_CHAR_CODE('tabs')
  kControlTabContentRectTag = FOUR_CHAR_CODE('rect')
  kControlTabEnabledFlagTag = FOUR_CHAR_CODE('enab')
! kControlTabFontStyleTag = kControlFontStyleTag 
! kControlTabInfoTag = FOUR_CHAR_CODE('tabi') 
! kControlTabImageContentTag = FOUR_CHAR_CODE('cont') 
  kControlTabInfoVersionZero = 0
+ kControlTabInfoVersionOne = 1     
  kControlSeparatorLineProc = 144
+ kControlKindSeparator = FOUR_CHAR_CODE('sepa')
  kControlGroupBoxTextTitleProc = 160
  kControlGroupBoxCheckBoxProc = 161
***************
*** 302,311 ****
  kControlGroupBoxSecondaryCheckBoxProc = 165
  kControlGroupBoxSecondaryPopupButtonProc = 166
  kControlGroupBoxMenuHandleTag = FOUR_CHAR_CODE('mhan')
! kControlGroupBoxFontStyleTag = kControlFontStyleTag         
! kControlGroupBoxTitleRectTag = FOUR_CHAR_CODE('trec')       
  kControlImageWellProc = 176
  kControlImageWellContentTag = FOUR_CHAR_CODE('cont')
! kControlImageWellTransformTag = FOUR_CHAR_CODE('tran')      
  kControlPopupArrowEastProc = 192
  kControlPopupArrowWestProc = 193
--- 348,363 ----
  kControlGroupBoxSecondaryCheckBoxProc = 165
  kControlGroupBoxSecondaryPopupButtonProc = 166
+ kControlKindGroupBox = FOUR_CHAR_CODE('grpb')
+ kControlKindCheckGroupBox = FOUR_CHAR_CODE('cgrp')
+ kControlKindPopupGroupBox = FOUR_CHAR_CODE('pgrp')
  kControlGroupBoxMenuHandleTag = FOUR_CHAR_CODE('mhan')
! kControlGroupBoxMenuRefTag = FOUR_CHAR_CODE('mhan')
! kControlGroupBoxFontStyleTag = kControlFontStyleTag 
! kControlGroupBoxTitleRectTag = FOUR_CHAR_CODE('trec') 
  kControlImageWellProc = 176
+ kControlKindImageWell = FOUR_CHAR_CODE('well')
  kControlImageWellContentTag = FOUR_CHAR_CODE('cont')
! kControlImageWellTransformTag = FOUR_CHAR_CODE('tran')
! kControlImageWellIsDragDestinationTag = FOUR_CHAR_CODE('drag') 
  kControlPopupArrowEastProc = 192
  kControlPopupArrowWestProc = 193
***************
*** 320,324 ****
--- 372,380 ----
  kControlPopupArrowOrientationNorth = 2
  kControlPopupArrowOrientationSouth = 3
+ kControlPopupArrowSizeNormal = 0
+ kControlPopupArrowSizeSmall = 1
+ kControlKindPopupArrow = FOUR_CHAR_CODE('parr')
  kControlPlacardProc = 224
+ kControlKindPlacard = FOUR_CHAR_CODE('plac')
  kControlClockTimeProc = 240
  kControlClockTimeSecondsProc = 241
***************
*** 327,332 ****
  kControlClockTypeHourMinute = 0
  kControlClockTypeHourMinuteSecond = 1
! kControlClockTypeMonthDay = 2
! kControlClockTypeMonthDayYear = 3
  kControlClockFlagStandard = 0
  kControlClockNoFlags = 0
--- 383,388 ----
  kControlClockTypeHourMinute = 0
  kControlClockTypeHourMinuteSecond = 1
! kControlClockTypeMonthDayYear = 2
! kControlClockTypeMonthYear = 3
  kControlClockFlagStandard = 0
  kControlClockNoFlags = 0
***************
*** 335,341 ****
  kControlClockFlagLive = 2
  kControlClockIsLive = 2
  kControlClockLongDateTag = FOUR_CHAR_CODE('date')
! kControlClockFontStyleTag = kControlFontStyleTag          
  kControlUserPaneProc = 256
  kControlUserItemDrawProcTag = FOUR_CHAR_CODE('uidp')
  kControlUserPaneDrawProcTag = FOUR_CHAR_CODE('draw')
--- 391,400 ----
  kControlClockFlagLive = 2
  kControlClockIsLive = 2
+ kControlKindClock = FOUR_CHAR_CODE('clck')
  kControlClockLongDateTag = FOUR_CHAR_CODE('date')
! kControlClockFontStyleTag = kControlFontStyleTag
! kControlClockAnimatingTag = FOUR_CHAR_CODE('anim') 
  kControlUserPaneProc = 256
+ kControlKindUserPane = FOUR_CHAR_CODE('upan')
  kControlUserItemDrawProcTag = FOUR_CHAR_CODE('uidp')
  kControlUserPaneDrawProcTag = FOUR_CHAR_CODE('draw')
***************
*** 346,353 ****
  kControlUserPaneActivateProcTag = FOUR_CHAR_CODE('acti')
  kControlUserPaneFocusProcTag = FOUR_CHAR_CODE('foci')
! kControlUserPaneBackgroundProcTag = FOUR_CHAR_CODE('back')  
  kControlEditTextProc = 272
  kControlEditTextPasswordProc = 274
! kControlEditTextInlineInputProc = 276                       
  kControlEditTextStyleTag = kControlFontStyleTag
  kControlEditTextTextTag = FOUR_CHAR_CODE('text')
--- 405,413 ----
  kControlUserPaneActivateProcTag = FOUR_CHAR_CODE('acti')
  kControlUserPaneFocusProcTag = FOUR_CHAR_CODE('foci')
! kControlUserPaneBackgroundProcTag = FOUR_CHAR_CODE('back') 
  kControlEditTextProc = 272
  kControlEditTextPasswordProc = 274
! kControlEditTextInlineInputProc = 276 
! kControlKindEditText = FOUR_CHAR_CODE('etxt')
  kControlEditTextStyleTag = kControlFontStyleTag
  kControlEditTextTextTag = FOUR_CHAR_CODE('text')
***************
*** 355,359 ****
  kControlEditTextKeyFilterTag = kControlKeyFilterTag
  kControlEditTextSelectionTag = FOUR_CHAR_CODE('sele')
! kControlEditTextPasswordTag = FOUR_CHAR_CODE('pass')        
  kControlEditTextKeyScriptBehaviorTag = FOUR_CHAR_CODE('kscr')
  kControlEditTextLockedTag = FOUR_CHAR_CODE('lock')
--- 415,419 ----
  kControlEditTextKeyFilterTag = kControlKeyFilterTag
  kControlEditTextSelectionTag = FOUR_CHAR_CODE('sele')
! kControlEditTextPasswordTag = FOUR_CHAR_CODE('pass') 
  kControlEditTextKeyScriptBehaviorTag = FOUR_CHAR_CODE('kscr')
  kControlEditTextLockedTag = FOUR_CHAR_CODE('lock')
***************
*** 362,403 ****
  kControlEditTextInlinePreUpdateProcTag = FOUR_CHAR_CODE('prup')
  kControlEditTextInlinePostUpdateProcTag = FOUR_CHAR_CODE('poup') 
  kControlStaticTextProc = 288
  kControlStaticTextStyleTag = kControlFontStyleTag
  kControlStaticTextTextTag = FOUR_CHAR_CODE('text')
! kControlStaticTextTextHeightTag = FOUR_CHAR_CODE('thei')    
! kControlStaticTextTruncTag = FOUR_CHAR_CODE('trun')        
  kControlPictureProc = 304
! kControlPictureNoTrackProc = 305                           
! kControlPictureHandleTag = FOUR_CHAR_CODE('pich')        
  kControlIconProc = 320
  kControlIconNoTrackProc = 321
  kControlIconSuiteProc = 322
! kControlIconSuiteNoTrackProc = 323                          
  kControlIconRefProc = 324
! kControlIconRefNoTrackProc = 325                           
  kControlIconTransformTag = FOUR_CHAR_CODE('trfm')
! kControlIconAlignmentTag = FOUR_CHAR_CODE('algn')        
  kControlIconResourceIDTag = FOUR_CHAR_CODE('ires')
! kControlIconContentTag = FOUR_CHAR_CODE('cont')        
  kControlWindowHeaderProc = 336
! kControlWindowListViewHeaderProc = 337                      
  kControlListBoxProc = 352
  kControlListBoxAutoSizeProc = 353
  kControlListBoxListHandleTag = FOUR_CHAR_CODE('lhan')
  kControlListBoxKeyFilterTag = kControlKeyFilterTag
! kControlListBoxFontStyleTag = kControlFontStyleTag          
  kControlListBoxDoubleClickTag = FOUR_CHAR_CODE('dblc')
! kControlListBoxLDEFTag = FOUR_CHAR_CODE('ldef')        
  kControlPushButtonProc = 368
  kControlCheckBoxProc = 369
  kControlRadioButtonProc = 370
  kControlPushButLeftIconProc = 374
! kControlPushButRightIconProc = 375                          
  kControlCheckBoxAutoToggleProc = 371
  kControlRadioButtonAutoToggleProc = 372
  kControlPushButtonDefaultTag = FOUR_CHAR_CODE('dflt')
! kControlPushButtonCancelTag = FOUR_CHAR_CODE('cncl')        
  kControlScrollBarProc = 384
! kControlScrollBarLiveProc = 386                           
  kControlPopupButtonProc = 400
  kControlPopupFixedWidthVariant = 1 << 0
--- 422,478 ----
  kControlEditTextInlinePreUpdateProcTag = FOUR_CHAR_CODE('prup')
  kControlEditTextInlinePostUpdateProcTag = FOUR_CHAR_CODE('poup') 
+ kControlEditTextCFStringTag = FOUR_CHAR_CODE('cfst') 
  kControlStaticTextProc = 288
+ kControlKindStaticText = FOUR_CHAR_CODE('stxt')
  kControlStaticTextStyleTag = kControlFontStyleTag
  kControlStaticTextTextTag = FOUR_CHAR_CODE('text')
! kControlStaticTextTextHeightTag = FOUR_CHAR_CODE('thei') 
! kControlStaticTextTruncTag = FOUR_CHAR_CODE('trun') 
! kControlStaticTextCFStringTag = FOUR_CHAR_CODE('cfst') 
  kControlPictureProc = 304
! kControlPictureNoTrackProc = 305   
! kControlKindPicture = FOUR_CHAR_CODE('pict')
! kControlPictureHandleTag = FOUR_CHAR_CODE('pich') 
  kControlIconProc = 320
  kControlIconNoTrackProc = 321
  kControlIconSuiteProc = 322
! kControlIconSuiteNoTrackProc = 323   
  kControlIconRefProc = 324
! kControlIconRefNoTrackProc = 325   
! kControlKindIcon = FOUR_CHAR_CODE('icon')
  kControlIconTransformTag = FOUR_CHAR_CODE('trfm')
! kControlIconAlignmentTag = FOUR_CHAR_CODE('algn') 
  kControlIconResourceIDTag = FOUR_CHAR_CODE('ires')
! kControlIconContentTag = FOUR_CHAR_CODE('cont') 
  kControlWindowHeaderProc = 336
! kControlWindowListViewHeaderProc = 337 
! kControlKindWindowHeader = FOUR_CHAR_CODE('whed')
  kControlListBoxProc = 352
  kControlListBoxAutoSizeProc = 353
+ kControlKindListBox = FOUR_CHAR_CODE('lbox')
  kControlListBoxListHandleTag = FOUR_CHAR_CODE('lhan')
  kControlListBoxKeyFilterTag = kControlKeyFilterTag
! kControlListBoxFontStyleTag = kControlFontStyleTag 
  kControlListBoxDoubleClickTag = FOUR_CHAR_CODE('dblc')
! kControlListBoxLDEFTag = FOUR_CHAR_CODE('ldef') 
  kControlPushButtonProc = 368
  kControlCheckBoxProc = 369
  kControlRadioButtonProc = 370
  kControlPushButLeftIconProc = 374
! kControlPushButRightIconProc = 375   
  kControlCheckBoxAutoToggleProc = 371
  kControlRadioButtonAutoToggleProc = 372
+ kControlPushButtonIconOnLeft = 6
+ kControlPushButtonIconOnRight = 7
+ kControlKindPushButton = FOUR_CHAR_CODE('push')
+ kControlKindPushIconButton = FOUR_CHAR_CODE('picn')
+ kControlKindRadioButton = FOUR_CHAR_CODE('rdio')
+ kControlKindCheckBox = FOUR_CHAR_CODE('cbox')
  kControlPushButtonDefaultTag = FOUR_CHAR_CODE('dflt')
! kControlPushButtonCancelTag = FOUR_CHAR_CODE('cncl') 
  kControlScrollBarProc = 384
! kControlScrollBarLiveProc = 386   
! kControlKindScrollBar = FOUR_CHAR_CODE('sbar')
! kControlScrollBarShowsArrowsTag = FOUR_CHAR_CODE('arro') 
  kControlPopupButtonProc = 400
  kControlPopupFixedWidthVariant = 1 << 0
***************
*** 405,418 ****
  kControlPopupUseAddResMenuVariant = 1 << 2
  kControlPopupUseWFontVariant = kControlUsesOwningWindowsFontVariant
  kControlPopupButtonMenuHandleTag = FOUR_CHAR_CODE('mhan')
! kControlPopupButtonMenuIDTag = FOUR_CHAR_CODE('mnid')       
! kControlPopupButtonExtraHeightTag = FOUR_CHAR_CODE('exht')  
  kControlRadioGroupProc = 416
  kControlScrollTextBoxProc = 432
  kControlScrollTextBoxAutoScrollProc = 433
  kControlScrollTextBoxDelayBeforeAutoScrollTag = FOUR_CHAR_CODE('stdl')
  kControlScrollTextBoxDelayBetweenAutoScrollTag = FOUR_CHAR_CODE('scdl')
  kControlScrollTextBoxAutoScrollAmountTag = FOUR_CHAR_CODE('samt')
! kControlScrollTextBoxContentsTag = FOUR_CHAR_CODE('tres')   
  kControlCheckboxUncheckedValue = kControlCheckBoxUncheckedValue
  kControlCheckboxCheckedValue = kControlCheckBoxCheckedValue
--- 480,648 ----
  kControlPopupUseAddResMenuVariant = 1 << 2
  kControlPopupUseWFontVariant = kControlUsesOwningWindowsFontVariant
+ kControlKindPopupButton = FOUR_CHAR_CODE('popb')
  kControlPopupButtonMenuHandleTag = FOUR_CHAR_CODE('mhan')
! kControlPopupButtonMenuRefTag = FOUR_CHAR_CODE('mhan')
! kControlPopupButtonMenuIDTag = FOUR_CHAR_CODE('mnid') 
! kControlPopupButtonExtraHeightTag = FOUR_CHAR_CODE('exht')
! kControlPopupButtonOwnedMenuRefTag = FOUR_CHAR_CODE('omrf')
! kControlPopupButtonCheckCurrentTag = FOUR_CHAR_CODE('chck') 
  kControlRadioGroupProc = 416
+ kControlKindRadioGroup = FOUR_CHAR_CODE('rgrp')
  kControlScrollTextBoxProc = 432
  kControlScrollTextBoxAutoScrollProc = 433
+ kControlKindScrollingTextBox = FOUR_CHAR_CODE('stbx')
  kControlScrollTextBoxDelayBeforeAutoScrollTag = FOUR_CHAR_CODE('stdl')
  kControlScrollTextBoxDelayBetweenAutoScrollTag = FOUR_CHAR_CODE('scdl')
  kControlScrollTextBoxAutoScrollAmountTag = FOUR_CHAR_CODE('samt')
! kControlScrollTextBoxContentsTag = FOUR_CHAR_CODE('tres')
! kControlScrollTextBoxAnimatingTag = FOUR_CHAR_CODE('anim') 
! kControlKindDisclosureButton = FOUR_CHAR_CODE('disb')
! kControlDisclosureButtonClosed = 0
! kControlDisclosureButtonDisclosed = 1
! kControlRoundButtonNormalSize = kControlSizeNormal
! kControlRoundButtonLargeSize = kControlSizeLarge
! kControlRoundButtonContentTag = FOUR_CHAR_CODE('cont')
! kControlRoundButtonSizeTag = FOUR_CHAR_CODE('size') 
! kControlKindRoundButton = FOUR_CHAR_CODE('rndb')
! kControlKindDataBrowser = FOUR_CHAR_CODE('datb')
! errDataBrowserNotConfigured = -4970
! errDataBrowserItemNotFound = -4971
! errDataBrowserItemNotAdded = -4975
! errDataBrowserPropertyNotFound = -4972
! errDataBrowserInvalidPropertyPart = -4973
! errDataBrowserInvalidPropertyData = -4974
! errDataBrowserPropertyNotSupported = -4979 
! kControlDataBrowserIncludesFrameAndFocusTag = FOUR_CHAR_CODE('brdr')
! kControlDataBrowserKeyFilterTag = kControlEditTextKeyFilterTag
! kControlDataBrowserEditTextKeyFilterTag = kControlDataBrowserKeyFilterTag
! kControlDataBrowserEditTextValidationProcTag = kControlEditTextValidationProcTag
! kDataBrowserNoView = 0x3F3F3F3F
! kDataBrowserListView = FOUR_CHAR_CODE('lstv')
! kDataBrowserColumnView = FOUR_CHAR_CODE('clmv')
! kDataBrowserDragSelect = 1 << 0
! kDataBrowserSelectOnlyOne = 1 << 1
! kDataBrowserResetSelection = 1 << 2
! kDataBrowserCmdTogglesSelection = 1 << 3
! kDataBrowserNoDisjointSelection = 1 << 4
! kDataBrowserAlwaysExtendSelection = 1 << 5
! kDataBrowserNeverEmptySelectionSet = 1 << 6 
! kDataBrowserOrderUndefined = 0
! kDataBrowserOrderIncreasing = 1
! kDataBrowserOrderDecreasing = 2
! kDataBrowserNoItem = 0L    
! kDataBrowserItemNoState = 0
! # kDataBrowserItemAnyState = (unsigned long)(-1)
! kDataBrowserItemIsSelected = 1 << 0
! kDataBrowserContainerIsOpen = 1 << 1
! kDataBrowserItemIsDragTarget = 1 << 2 
! kDataBrowserRevealOnly = 0
! kDataBrowserRevealAndCenterInView = 1 << 0
! kDataBrowserRevealWithoutSelecting = 1 << 1
! kDataBrowserItemsAdd = 0
! kDataBrowserItemsAssign = 1
! kDataBrowserItemsToggle = 2
! kDataBrowserItemsRemove = 3     
! kDataBrowserSelectionAnchorUp = 0
! kDataBrowserSelectionAnchorDown = 1
! kDataBrowserSelectionAnchorLeft = 2
! kDataBrowserSelectionAnchorRight = 3
! kDataBrowserEditMsgUndo = kHICommandUndo
! kDataBrowserEditMsgRedo = kHICommandRedo
! kDataBrowserEditMsgCut = kHICommandCut
! kDataBrowserEditMsgCopy = kHICommandCopy
! kDataBrowserEditMsgPaste = kHICommandPaste
! kDataBrowserEditMsgClear = kHICommandClear
! kDataBrowserEditMsgSelectAll = kHICommandSelectAll
! kDataBrowserItemAdded = 1
! kDataBrowserItemRemoved = 2
! kDataBrowserEditStarted = 3
! kDataBrowserEditStopped = 4
! kDataBrowserItemSelected = 5
! kDataBrowserItemDeselected = 6
! kDataBrowserItemDoubleClicked = 7
! kDataBrowserContainerOpened = 8
! kDataBrowserContainerClosing = 9
! kDataBrowserContainerClosed = 10
! kDataBrowserContainerSorting = 11
! kDataBrowserContainerSorted = 12
! kDataBrowserUserToggledContainer = 16
! kDataBrowserTargetChanged = 15
! kDataBrowserUserStateChanged = 13
! kDataBrowserSelectionSetChanged = 14  
! kDataBrowserItemNoProperty = 0L
! kDataBrowserItemIsActiveProperty = 1L
! kDataBrowserItemIsSelectableProperty = 2L
! kDataBrowserItemIsEditableProperty = 3L
! kDataBrowserItemIsContainerProperty = 4L
! kDataBrowserContainerIsOpenableProperty = 5L
! kDataBrowserContainerIsClosableProperty = 6L
! kDataBrowserContainerIsSortableProperty = 7L
! kDataBrowserItemSelfIdentityProperty = 8L
! kDataBrowserContainerAliasIDProperty = 9L
! kDataBrowserColumnViewPreviewProperty = 10L
! kDataBrowserItemParentContainerProperty = 11L 
! kDataBrowserCustomType = 0x3F3F3F3F
! kDataBrowserIconType = FOUR_CHAR_CODE('icnr')
! kDataBrowserTextType = FOUR_CHAR_CODE('text')
! kDataBrowserDateTimeType = FOUR_CHAR_CODE('date')
! kDataBrowserSliderType = FOUR_CHAR_CODE('sldr')
! kDataBrowserCheckboxType = FOUR_CHAR_CODE('chbx')
! kDataBrowserProgressBarType = FOUR_CHAR_CODE('prog')
! kDataBrowserRelevanceRankType = FOUR_CHAR_CODE('rank')
! kDataBrowserPopupMenuType = FOUR_CHAR_CODE('menu')
! kDataBrowserIconAndTextType = FOUR_CHAR_CODE('ticn') 
! kDataBrowserPropertyEnclosingPart = 0L
! kDataBrowserPropertyContentPart = FOUR_CHAR_CODE('----')
! kDataBrowserPropertyDisclosurePart = FOUR_CHAR_CODE('disc')
! kDataBrowserPropertyTextPart = kDataBrowserTextType
! kDataBrowserPropertyIconPart = kDataBrowserIconType
! kDataBrowserPropertySliderPart = kDataBrowserSliderType
! kDataBrowserPropertyCheckboxPart = kDataBrowserCheckboxType
! kDataBrowserPropertyProgressBarPart = kDataBrowserProgressBarType
! kDataBrowserPropertyRelevanceRankPart = kDataBrowserRelevanceRankType
! kDataBrowserUniversalPropertyFlagsMask = 0xFF
! kDataBrowserPropertyIsMutable = 1 << 0
! kDataBrowserDefaultPropertyFlags = 0 << 0
! kDataBrowserUniversalPropertyFlags = kDataBrowserUniversalPropertyFlagsMask
! kDataBrowserPropertyIsEditable = kDataBrowserPropertyIsMutable 
! kDataBrowserPropertyFlagsOffset = 8
! kDataBrowserPropertyFlagsMask = 0xFF << kDataBrowserPropertyFlagsOffset
! kDataBrowserCheckboxTriState = 1 << kDataBrowserPropertyFlagsOffset
! kDataBrowserDateTimeRelative = 1 << (kDataBrowserPropertyFlagsOffset)
! kDataBrowserDateTimeDateOnly = 1 << (kDataBrowserPropertyFlagsOffset + 1)
! kDataBrowserDateTimeTimeOnly = 1 << (kDataBrowserPropertyFlagsOffset + 2)
! kDataBrowserDateTimeSecondsToo = 1 << (kDataBrowserPropertyFlagsOffset + 3)
! kDataBrowserSliderPlainThumb = kThemeThumbPlain << kDataBrowserPropertyFlagsOffset
! kDataBrowserSliderUpwardThumb = kThemeThumbUpward << kDataBrowserPropertyFlagsOffset
! kDataBrowserSliderDownwardThumb = kThemeThumbDownward << kDataBrowserPropertyFlagsOffset
! kDataBrowserDoNotTruncateText = 3 << kDataBrowserPropertyFlagsOffset
! kDataBrowserTruncateTextAtEnd = 2 << kDataBrowserPropertyFlagsOffset
! kDataBrowserTruncateTextMiddle = 0 << kDataBrowserPropertyFlagsOffset
! kDataBrowserTruncateTextAtStart = 1 << kDataBrowserPropertyFlagsOffset
! kDataBrowserPropertyModificationFlags = kDataBrowserPropertyFlagsMask
! kDataBrowserRelativeDateTime = kDataBrowserDateTimeRelative 
! kDataBrowserViewSpecificFlagsOffset = 16
! kDataBrowserViewSpecificFlagsMask = 0xFF << kDataBrowserViewSpecificFlagsOffset
! kDataBrowserViewSpecificPropertyFlags = kDataBrowserViewSpecificFlagsMask 
! kDataBrowserClientPropertyFlagsOffset = 24
! # kDataBrowserClientPropertyFlagsMask = (unsigned long)(0xFF << kDataBrowserClientPropertyFlagsOffset)
! kDataBrowserLatestCallbacks = 0
! kDataBrowserContentHit = 1
! kDataBrowserNothingHit = 0
! kDataBrowserStopTracking = -1
! kDataBrowserLatestCustomCallbacks = 0
! kDataBrowserTableViewMinimalHilite = 0
! kDataBrowserTableViewFillHilite = 1
! kDataBrowserTableViewSelectionColumn = 1 << kDataBrowserViewSpecificFlagsOffset
! kDataBrowserTableViewLastColumn = -1
! kDataBrowserListViewMovableColumn = 1 << (kDataBrowserViewSpecificFlagsOffset + 1)
! kDataBrowserListViewSortableColumn = 1 << (kDataBrowserViewSpecificFlagsOffset + 2)
! kDataBrowserListViewSelectionColumn = kDataBrowserTableViewSelectionColumn
! kDataBrowserListViewDefaultColumnFlags = kDataBrowserListViewMovableColumn + kDataBrowserListViewSortableColumn
! kDataBrowserListViewLatestHeaderDesc = 0
! kDataBrowserListViewAppendColumn = kDataBrowserTableViewLastColumn
! kControlEditUnicodeTextPostUpdateProcTag = FOUR_CHAR_CODE('upup')
! kControlEditUnicodeTextProc = 912
! kControlEditUnicodeTextPasswordProc = 914
  kControlCheckboxUncheckedValue = kControlCheckBoxUncheckedValue
  kControlCheckboxCheckedValue = kControlCheckBoxCheckedValue