1 files changed, 45 insertions, 29 deletions
diff --git a/Lib/plat-mac/Carbon/Windows.py b/Lib/plat-mac/Carbon/Windows.py
index 71685df..af8eaf2 100644
--- a/Lib/plat-mac/Carbon/Windows.py
+++ b/Lib/plat-mac/Carbon/Windows.py
@@ -3,21 +3,23 @@
 def FOUR_CHAR_CODE(x): return x
 false = 0
 true = 1
-kAlertWindowClass = 1L
-kMovableAlertWindowClass = 2L
-kModalWindowClass = 3L
-kMovableModalWindowClass = 4L
-kFloatingWindowClass = 5L
-kDocumentWindowClass = 6L
-kUtilityWindowClass = 8L
-kHelpWindowClass = 10L
-kSheetWindowClass = 11L
-kToolbarWindowClass = 12L
-kPlainWindowClass = 13L
-kOverlayWindowClass = 14L
-kSheetAlertWindowClass = 15L
-kAltPlainWindowClass = 16L
-# kAllWindowClasses = (unsigned long)0xFFFFFFFF 
+kWindowNoConstrainAttribute = 0x80000000
+kAlertWindowClass = 1
+kMovableAlertWindowClass = 2
+kModalWindowClass = 3
+kMovableModalWindowClass = 4
+kFloatingWindowClass = 5
+kDocumentWindowClass = 6
+kUtilityWindowClass = 8
+kHelpWindowClass = 10
+kSheetWindowClass = 11
+kToolbarWindowClass = 12
+kPlainWindowClass = 13
+kOverlayWindowClass = 14
+kSheetAlertWindowClass = 15
+kAltPlainWindowClass = 16
+kDrawerWindowClass = 20
+# kAllWindowClasses = (unsigned long)0xFFFFFFFF
 kWindowNoAttributes = 0L
 kWindowCloseBoxAttribute = (1L << 0)
 kWindowHorizontalZoomAttribute = (1L << 1)
@@ -26,6 +28,7 @@ kWindowFullZoomAttribute = (kWindowVerticalZoomAttribute | kWindowHorizontalZoom
 kWindowCollapseBoxAttribute = (1L << 3)
 kWindowResizableAttribute = (1L << 4)
 kWindowSideTitlebarAttribute = (1L << 5)
+kWindowToolbarButtonAttribute = (1L << 6)
 kWindowNoUpdatesAttribute = (1L << 16)
 kWindowNoActivatesAttribute = (1L << 17)
 kWindowOpaqueForEventsAttribute = (1L << 18)
@@ -35,6 +38,7 @@ kWindowStandardHandlerAttribute = (1L << 25)
 kWindowHideOnFullScreenAttribute = (1L << 26)
 kWindowInWindowMenuAttribute = (1L << 27)
 kWindowLiveResizeAttribute = (1L << 28)
+# kWindowNoConstrainAttribute = (unsigned long)((1L << 31))
 kWindowStandardDocumentAttributes = (kWindowCloseBoxAttribute | kWindowFullZoomAttribute | kWindowCollapseBoxAttribute | kWindowResizableAttribute)
 kWindowStandardFloatingAttributes = (kWindowCloseBoxAttribute | kWindowCollapseBoxAttribute)
 kWindowDefProcType = FOUR_CHAR_CODE('WDEF')
@@ -119,15 +123,16 @@ kWindowStaggerParentWindow = 0xB80A
 kWindowCenterParentWindowScreen = 0x680A
 kWindowAlertPositionParentWindowScreen = 0x700A
 kWindowStaggerParentWindowScreen = 0x780A
-kWindowCenterOnMainScreen = 0x00000001
-kWindowCenterOnParentWindow = 0x00000002
-kWindowCenterOnParentWindowScreen = 0x00000003
-kWindowCascadeOnMainScreen = 0x00000004
-kWindowCascadeOnParentWindow = 0x00000005
-kWindowCascadeOnParentWindowScreen = 0x00000006
-kWindowAlertPositionOnMainScreen = 0x00000007
-kWindowAlertPositionOnParentWindow = 0x00000008
-kWindowAlertPositionOnParentWindowScreen = 0x00000009
+kWindowCenterOnMainScreen = 1
+kWindowCenterOnParentWindow = 2
+kWindowCenterOnParentWindowScreen = 3
+kWindowCascadeOnMainScreen = 4
+kWindowCascadeOnParentWindow = 5
+kWindowCascadeOnParentWindowScreen = 6
+kWindowCascadeStartAtParentWindowScreen = 10
+kWindowAlertPositionOnMainScreen = 7
+kWindowAlertPositionOnParentWindow = 8
+kWindowAlertPositionOnParentWindowScreen = 9
 kWindowTitleBarRgn = 0
 kWindowTitleTextRgn = 1
 kWindowCloseBoxRgn = 2
@@ -156,7 +161,9 @@ inGoAway = 6
 inZoomIn = 7
 inZoomOut = 8
 inCollapseBox = 11
-inProxyIcon = 12    
+inProxyIcon = 12
+inToolbarButton = 13
+inStructure = 15    
 wNoHit = 0
 wInContent = 1
 wInDrag = 2
@@ -165,7 +172,9 @@ wInGoAway = 4
 wInZoomIn = 5
 wInZoomOut = 6
 wInCollapseBox = 9
-wInProxyIcon = 10    
+wInProxyIcon = 10
+wInToolbarButton = 11
+wInStructure = 13    
 kWindowMsgDraw = 0
 kWindowMsgHitTest = 1
 kWindowMsgCalculateShape = 2
@@ -227,7 +236,6 @@ kWindowModalityNone = 0
 kWindowModalitySystemModal = 1
 kWindowModalityAppModal = 2
 kWindowModalityWindowModal = 3
-windowGroupInvalidErr = -5616 
 kWindowGroupAttrSelectAsLayer = 1 << 0
 kWindowGroupAttrMoveTogether = 1 << 1
 kWindowGroupAttrLayerTogether = 1 << 2
@@ -245,18 +253,26 @@ kWindowPaintProcOptionsNone = 0
 kScrollWindowNoOptions = 0
 kScrollWindowInvalidate = (1L << 0)
 kScrollWindowEraseToPortBackground = (1L << 1) 
+kWindowMenuIncludeRotate = 1 << 0
 kWindowZoomTransitionEffect = 1
 kWindowSheetTransitionEffect = 2
-kWindowSlideTransitionEffect = 3     
+kWindowSlideTransitionEffect = 3
 kWindowShowTransitionAction = 1
 kWindowHideTransitionAction = 2
 kWindowMoveTransitionAction = 3
-kWindowResizeTransitionAction = 4     
+kWindowResizeTransitionAction = 4
 kWindowConstrainMayResize = (1L << 0)
 kWindowConstrainMoveRegardlessOfFit = (1L << 1)
 kWindowConstrainAllowPartial = (1L << 2)
 kWindowConstrainCalcOnly = (1L << 3)
+kWindowConstrainUseTransitionWindow = (1L << 4)
 kWindowConstrainStandardOptions = kWindowConstrainMoveRegardlessOfFit
+kWindowLatentVisibleFloater = 1 << 0
+kWindowLatentVisibleSuspend = 1 << 1
+kWindowLatentVisibleFullScreen = 1 << 2
+kWindowLatentVisibleAppHidden = 1 << 3
+kWindowLatentVisibleCollapsedOwner = 1 << 4
+kWindowLatentVisibleCollapsedGroup = 1 << 5
 kWindowPropertyPersistent = 0x00000001 
 kWindowGroupAttrSelectable = kWindowGroupAttrSelectAsLayer
 kWindowGroupAttrPositionFixed = kWindowGroupAttrMoveTogether