[Python-checkins] python/dist/src/Mac/Modules/list _Listmodule.c, 1.16, 1.17 listsupport.py, 1.17, 1.18

[jackjansen at users.sourceforge.net]

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

Modified Files:
	_Listmodule.c listsupport.py 
Log Message:
Getting rid of WITHOUT_FRAMEWORKS and ACCESSOR_CALLS_ARE_FUNCTIONS:
MacOS9isms.


Index: _Listmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/list/_Listmodule.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** _Listmodule.c	23 Dec 2002 23:16:23 -0000	1.16
--- _Listmodule.c	19 Nov 2003 16:13:29 -0000	1.17
***************
*** 15,29 ****
  /* 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 <Lists.h>
- #else
  #include <Carbon/Carbon.h>
- #endif
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
--- 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>
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
***************
*** 33,61 ****
  #define ListObj_New _ListObj_New
  #define ListObj_Convert _ListObj_Convert
- #endif
- 
- #if !ACCESSOR_CALLS_ARE_FUNCTIONS
- #define GetListPort(list) ((CGrafPtr)(*(list))->port)
- #define GetListVerticalScrollBar(list) ((*(list))->vScroll)
- #define GetListHorizontalScrollBar(list) ((*(list))->hScroll)
- #define GetListActive(list) ((*(list))->lActive)
- #define GetListClickTime(list) ((*(list))->clikTime)
- #define GetListRefCon(list) ((*(list))->refCon)
- #define GetListDefinition(list) ((*(list))->listDefProc) /* XXX Is this indeed the same? */
- #define GetListUserHandle(list) ((*(list))->userHandle)
- #define GetListDataHandle(list) ((*(list))->cells)
- #define GetListFlags(list) ((*(list))->listFlags)
- #define GetListSelectionFlags(list) ((*(list))->selFlags)
- #define SetListViewBounds(list, bounds) (((*(list))->rView) = *(bounds))
- 
- #define SetListPort(list, port) (((*(list))->port) = (GrafPtr)(port))
- #define SetListCellIndent(list, ind) (((*(list))->indent) = *(ind))
- #define SetListClickTime(list, time) (((*(list))->clikTime) = (time))
- #define SetListLastClick(list, click) (((*(list)->lastClick) = *(click))
- #define SetListRefCon(list, refcon) (((*(list))->refCon) = (refcon))
- #define SetListUserHandle(list, handle) (((*(list))->userHandle) = (handle))
- #define SetListFlags(list, flags) (((*(list))->listFlags) = (flags))
- #define SetListSelectionFlags(list, flags) (((*(list))->selFlags) = (flags))
- 
  #endif
  
--- 29,32 ----

Index: listsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/list/listsupport.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** listsupport.py	12 Dec 2002 10:31:51 -0000	1.17
--- listsupport.py	19 Nov 2003 16:13:29 -0000	1.18
***************
*** 40,48 ****
  
  includestuff = includestuff + """
- #ifdef WITHOUT_FRAMEWORKS
- #include <Lists.h>
- #else
  #include <Carbon/Carbon.h>
- #endif
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
--- 40,44 ----
***************
*** 52,80 ****
  #define ListObj_New _ListObj_New
  #define ListObj_Convert _ListObj_Convert
- #endif
- 
- #if !ACCESSOR_CALLS_ARE_FUNCTIONS
- #define GetListPort(list) ((CGrafPtr)(*(list))->port)
- #define GetListVerticalScrollBar(list) ((*(list))->vScroll)
- #define GetListHorizontalScrollBar(list) ((*(list))->hScroll)
- #define GetListActive(list) ((*(list))->lActive)
- #define GetListClickTime(list) ((*(list))->clikTime)
- #define GetListRefCon(list) ((*(list))->refCon)
- #define GetListDefinition(list) ((*(list))->listDefProc) /* XXX Is this indeed the same? */
- #define GetListUserHandle(list) ((*(list))->userHandle)
- #define GetListDataHandle(list) ((*(list))->cells)
- #define GetListFlags(list) ((*(list))->listFlags)
- #define GetListSelectionFlags(list) ((*(list))->selFlags)
- #define SetListViewBounds(list, bounds) (((*(list))->rView) = *(bounds))
- 
- #define SetListPort(list, port) (((*(list))->port) = (GrafPtr)(port))
- #define SetListCellIndent(list, ind) (((*(list))->indent) = *(ind))
- #define SetListClickTime(list, time) (((*(list))->clikTime) = (time))
- #define SetListLastClick(list, click) (((*(list)->lastClick) = *(click))
- #define SetListRefCon(list, refcon) (((*(list))->refCon) = (refcon))
- #define SetListUserHandle(list, handle) (((*(list))->userHandle) = (handle))
- #define SetListFlags(list, flags) (((*(list))->listFlags) = (flags))
- #define SetListSelectionFlags(list, flags) (((*(list))->selFlags) = (flags))
- 
  #endif
  
--- 48,51 ----