[Python-checkins] CVS: python/dist/src/Mac/Modules/menu _Menumodule.c,1.5,1.5.2.1 menuscan.py,1.10,1.10.16.1 menusupport.py,1.13,1.13.2.1

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Modules/menu
In directory usw-pr-cvs1:/tmp/cvs-serv12554/Modules/menu

Modified Files:
      Tag: r22rc1-branch
	_Menumodule.c menuscan.py menusupport.py 
Log Message:
Merged Mac subtree into the 22c1 branch.


Index: _Menumodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/_Menumodule.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** _Menumodule.c	2001/12/08 18:02:53	1.5
--- _Menumodule.c	2001/12/19 15:10:16	1.5.2.1
***************
*** 6,11 ****
--- 6,15 ----
  
  
+ #ifdef _WIN32
+ #include "pywintoolbox.h"
+ #else
  #include "macglue.h"
  #include "pymactoolbox.h"
+ #endif
  
[...1688 lines suppressed...]
*** 2890,2893 ****
--- 3762,3770 ----
  	{"HideMenuBar", (PyCFunction)Menu_HideMenuBar, 1,
  	 "() -> None"},
+ 
+ #if TARGET_API_MAC_CARBON
+ 	{"AcquireRootMenu", (PyCFunction)Menu_AcquireRootMenu, 1,
+ 	 "() -> (MenuHandle _rv)"},
+ #endif
  	{"DeleteMCEntries", (PyCFunction)Menu_DeleteMCEntries, 1,
  	 "(MenuID menuID, short menuItem) -> None"},
***************
*** 2896,2899 ****
--- 3773,3778 ----
  	{"IsShowContextualMenuClick", (PyCFunction)Menu_IsShowContextualMenuClick, 1,
  	 "(EventRecord inEvent) -> (Boolean _rv)"},
+ 	{"LMGetTheMenu", (PyCFunction)Menu_LMGetTheMenu, 1,
+ 	 "() -> (SInt16 _rv)"},
  
  #if !TARGET_API_MAC_CARBON

Index: menuscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/menuscan.py,v
retrieving revision 1.10
retrieving revision 1.10.16.1
diff -C2 -d -r1.10 -r1.10.16.1
*** menuscan.py	2000/12/10 23:43:48	1.10
--- menuscan.py	2001/12/19 15:10:16	1.10.16.1
***************
*** 43,46 ****
--- 43,47 ----
  			"GetMenuTitle", # Funny arg/returnvalue
  			"SetMenuTitle",
+ 			"SetMenuTitleIcon", # void*
  			]
  
***************
*** 84,88 ****
  				'ChangeMenuItemPropertyAttributes',
  				'GetMenuItemPropertyAttributes',
! 				
  			])]
  			
--- 85,119 ----
  				'ChangeMenuItemPropertyAttributes',
  				'GetMenuItemPropertyAttributes',
! 				'AcquireRootMenu',
! 				'UpdateInvalidMenuItems',
! 				'InvalidateMenuItems',
! 				'IsMenuItemInvalid',
! 				'GetMenuCommandMark',
! 				'SetMenuCommandMark',
! 				'GetMenuType',
! 				'SetMenuItemCommandKey',
! 				'GetMenuItemCommandKey',
! 				'SetMenuItemIndent',
! 				'GetMenuItemIndent',
! 				'SetMenuItemTextWithCFString',
! 				'CopyMenuItemTextAsCFString',
! 				'GetMenuItemHierarchicalMenu',
! 				'SetMenuItemHierarchicalMenu',
! 				'SetRootMenu',
! 				'IsMenuBarInvalid',
! 				'InvalidateMenuEnabling',
! 				'InsertMenuItemTextWithCFString',
! 				'AppendMenuItemTextWithCFString',
! 				'DeleteMenuItems',
! 				'CopyMenuItems',
! 				'IsMenuSizeInvalid',
! 				'InvalidateMenuSize',
! 				'SetMenuTitleWithCFString',
! 				'CopyMenuTitleAsCFString',
! 				'DuplicateMenu',
! 				'ReleaseMenu',
! 				'RetainMenu',
! 				'GetMenuRetainCount',
! 				'IsValidMenu',
  			])]
  			
***************
*** 97,100 ****
--- 128,135 ----
  			"MenuDefSpec_ptr", # ditto
  			"MenuTrackingData",
+ 			"void_ptr", 	# Don't know yet.
+ 			"EventRef",	# For now, not exported yet.
+ 			"MenuItemDataPtr", # Not yet.
+ 			"MenuItemDataRec_ptr",
  			]
  

Index: menusupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/menusupport.py,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** menusupport.py	2001/11/30 14:16:33	1.13
--- menusupport.py	2001/12/19 15:10:16	1.13.2.1
***************
*** 29,32 ****
--- 29,33 ----
  MenuID = Type("MenuID", "h")
  MenuItemIndex = Type("MenuItemIndex", "h")
+ MenuItemID = Type("MenuItemID", "l")
  MenuCommand = Type("MenuCommand", "l")
  MenuAttributes = Type("MenuAttributes", "l")
***************
*** 35,38 ****
--- 36,41 ----
  FMFontFamily = Type("FMFontFamily", "h")
  FMFontStyle = Type("FMFontStyle", "h")
+ CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
+ UniChar = Type("UniChar", "h")
  
  includestuff = includestuff + """