[Python-checkins] python/dist/src/Mac/Modules/cg _CGmodule.c, 1.11, 1.12 cgsupport.py, 1.6, 1.7

[jackjansen at users.sourceforge.net]

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

Modified Files:
	_CGmodule.c cgsupport.py 
Log Message:
Getting rid of WITHOUT_FRAMEWORKS and ACCESSOR_CALLS_ARE_FUNCTIONS:
MacOS9isms.


Index: _CGmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/cg/_CGmodule.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** _CGmodule.c	23 Dec 2002 23:16:21 -0000	1.11
--- _CGmodule.c	19 Nov 2003 16:13:24 -0000	1.12
***************
*** 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 <Quickdraw.h>
- #include <CGContext.h>
- #else
  #include <ApplicationServices/ApplicationServices.h>
- #endif
  
  #if !TARGET_API_MAC_OSX
--- 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 <ApplicationServices/ApplicationServices.h>
  
  #if !TARGET_API_MAC_OSX

Index: cgsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/cg/cgsupport.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cgsupport.py	3 Dec 2002 23:40:19 -0000	1.6
--- cgsupport.py	19 Nov 2003 16:13:25 -0000	1.7
***************
*** 24,33 ****
  
  includestuff = includestuff + """
- #ifdef WITHOUT_FRAMEWORKS
- #include <Quickdraw.h>
- #include <CGContext.h>
- #else
  #include <ApplicationServices/ApplicationServices.h>
- #endif
  
  #if !TARGET_API_MAC_OSX
--- 24,28 ----