[Python-checkins] CVS: python/dist/src/Mac/Modules/win _Winmodule.c,1.6,1.6.2.1 winscan.py,1.18,1.18.16.1 winsupport.py,1.29,1.29.2.1
Jack Jansen
jackjansen@users.sourceforge.net
2001年12月19日 07:10:20 -0800
Update of /cvsroot/python/python/dist/src/Mac/Modules/win
In directory usw-pr-cvs1:/tmp/cvs-serv12554/Modules/win
Modified Files:
Tag: r22rc1-branch
_Winmodule.c winscan.py winsupport.py
Log Message:
Merged Mac subtree into the 22c1 branch.
Index: _Winmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/_Winmodule.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** _Winmodule.c 2001年12月08日 18:02:54 1.6
--- _Winmodule.c 2001年12月19日 15:10:17 1.6.2.1
***************
*** 6,11 ****
--- 6,15 ----
+ #ifdef _WIN32
+ #include "pywintoolbox.h"
+ #else
#include "macglue.h"
#include "pymactoolbox.h"
+ #endif
[...1029 lines suppressed...]
--- 3746,3764 ----
{"CollapseAllWindows", (PyCFunction)Win_CollapseAllWindows, 1,
"(Boolean collapse) -> None"},
+
+ #if !TARGET_API_MAC_OS8
+ {"GetAvailableWindowPositioningBounds", (PyCFunction)Win_GetAvailableWindowPositioningBounds, 1,
+ "(GDHandle inDevice) -> (Rect availableRect)"},
+ #endif
+
+ #if !TARGET_API_MAC_OS8
+ {"DisableScreenUpdates", (PyCFunction)Win_DisableScreenUpdates, 1,
+ "() -> None"},
+ #endif
+
+ #if !TARGET_API_MAC_OS8
+ {"EnableScreenUpdates", (PyCFunction)Win_EnableScreenUpdates, 1,
+ "() -> None"},
+ #endif
{"PinRect", (PyCFunction)Win_PinRect, 1,
"(Rect theRect, Point thePt) -> (long _rv)"},
Index: winscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/winscan.py,v
retrieving revision 1.18
retrieving revision 1.18.16.1
diff -C2 -d -r1.18 -r1.18.16.1
*** winscan.py 2001年02月28日 23:32:42 1.18
--- winscan.py 2001年12月19日 15:10:17 1.18.16.1
***************
*** 72,76 ****
'GetWindowSpareFlag',
]),
! ('#if TARGET_API_MAC_CARBON', [
'IsWindowUpdatePending',
'FindWindowOfClass',
--- 72,76 ----
'GetWindowSpareFlag',
]),
! ('#if !TARGET_API_MAC_OS8', [
'IsWindowUpdatePending',
'FindWindowOfClass',
***************
*** 83,86 ****
--- 83,108 ----
'ChangeWindowAttributes',
'ReshapeCustomWindow',
+ 'EnableScreenUpdates',
+ 'DisableScreenUpdates',
+ 'GetAvailableWindowPositioningBounds',
+ 'CreateStandardWindowMenu',
+ 'GetSheetWindowParent',
+ 'HideSheetWindow',
+ 'ShowSheetWindow',
+ 'ConstrainWindowToScreen',
+ 'GetWindowGreatestAreaDevice',
+ 'CopyWindowTitleAsCFString',
+ 'SetWindowTitleWithCFString',
+ 'CopyWindowAlternateTitle',
+ 'SetWindowAlternateTitle',
+ 'GetWindowModality',
+ 'SetWindowModality',
+ 'SetWindowClass',
+ 'ReleaseWindow',
+ 'RetainWindow',
+ 'GetWindowRetainCount',
+ ]),
+ ('#if TARGET_API_MAC_OSX', [
+ 'TransitionWindowAndParent',
])]
***************
*** 93,96 ****
--- 115,119 ----
'WindowDefSpec', # Too difficult for now
'WindowDefSpec_ptr',
+ 'EventRef', #TBD
]
Index: winsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/winsupport.py,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -C2 -d -r1.29 -r1.29.2.1
*** winsupport.py 2001年11月30日 14:16:34 1.29
--- winsupport.py 2001年12月19日 15:10:17 1.29.2.1
***************
*** 50,53 ****
--- 50,58 ----
ScrollWindowOptions = Type("ScrollWindowOptions", "l")
WindowPartCode = Type("WindowPartCode", "h")
+ WindowDefPartCode = Type("WindowDefPartCode", "h")
+ WindowModality = Type("WindowModality", "l")
+ CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
+ GDHandle = OpaqueByValueType("GDHandle", "ResObj")
+ WindowConstrainOptions = Type("WindowConstrainOptions", "l")
PropertyCreator = OSTypeType("PropertyCreator")