[Python-checkins] python/dist/src/Mac/Modules/menu _Menumodule.c, 1.17, 1.18 menusupport.py, 1.20, 1.21

[jackjansen at users.sourceforge.net]

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

Modified Files:
	_Menumodule.c menusupport.py 
Log Message:
Getting rid of WITHOUT_FRAMEWORKS and ACCESSOR_CALLS_ARE_FUNCTIONS:
MacOS9isms.


Index: _Menumodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/_Menumodule.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** _Menumodule.c	23 Dec 2002 23:16:23 -0000	1.17
--- _Menumodule.c	19 Nov 2003 16:13:30 -0000	1.18
***************
*** 15,30 ****
  /* Macro to test whether a weak-loaded CFM function exists */
  #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL )  {\
!     	PyErr_SetString(PyExc_NotImplementedError, \
!     	"Not available in this shared library/OS version"); \
!     	return NULL; \
      }} while(0)
  
  
- #ifdef WITHOUT_FRAMEWORKS
- #include <Devices.h> /* Defines OpenDeskAcc in universal headers */
- #include <Menus.h>
- #else
  #include <Carbon/Carbon.h>
- #endif
  
  
--- 15,25 ----
  /* Macro to test whether a weak-loaded CFM function exists */
  #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL )  {\
!         PyErr_SetString(PyExc_NotImplementedError, \
!         "Not available in this shared library/OS version"); \
!         return NULL; \
      }} while(0)
  
  
  #include <Carbon/Carbon.h>
  
  
***************
*** 36,49 ****
  #define MenuObj_New _MenuObj_New
  #define MenuObj_Convert _MenuObj_Convert 
- #endif
- 
- #if !ACCESSOR_CALLS_ARE_FUNCTIONS
- #define GetMenuID(menu) ((*(menu))->menuID)
- #define GetMenuWidth(menu) ((*(menu))->menuWidth)
- #define GetMenuHeight(menu) ((*(menu))->menuHeight)
- 
- #define SetMenuID(menu, id) ((*(menu))->menuID = (id))
- #define SetMenuWidth(menu, width) ((*(menu))->menuWidth = (width))
- #define SetMenuHeight(menu, height) ((*(menu))->menuHeight = (height))
  #endif
  
--- 31,34 ----

Index: menusupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/menu/menusupport.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** menusupport.py	23 Dec 2002 23:16:23 -0000	1.20
--- menusupport.py	19 Nov 2003 16:13:30 -0000	1.21
***************
*** 40,49 ****
  
  includestuff = includestuff + """
- #ifdef WITHOUT_FRAMEWORKS
- #include <Devices.h> /* Defines OpenDeskAcc in universal headers */
- #include <Menus.h>
- #else
  #include <Carbon/Carbon.h>
- #endif
  
  
--- 40,44 ----
***************
*** 55,68 ****
  #define MenuObj_New _MenuObj_New
  #define MenuObj_Convert _MenuObj_Convert 
- #endif
- 
- #if !ACCESSOR_CALLS_ARE_FUNCTIONS
- #define GetMenuID(menu) ((*(menu))->menuID)
- #define GetMenuWidth(menu) ((*(menu))->menuWidth)
- #define GetMenuHeight(menu) ((*(menu))->menuHeight)
- 
- #define SetMenuID(menu, id) ((*(menu))->menuID = (id))
- #define SetMenuWidth(menu, width) ((*(menu))->menuWidth = (width))
- #define SetMenuHeight(menu, height) ((*(menu))->menuHeight = (height))
  #endif
  
--- 50,53 ----