[Python-checkins] CVS: python/dist/src/Mac/Modules/list Listmodule.c,1.14,1.15
Jack Jansen
jackjansen@users.sourceforge.net
Tue, 22 May 2001 14:52:51 -0700
Update of /cvsroot/python/python/dist/src/Mac/Modules/list
In directory usw-pr-cvs1:/tmp/cvs-serv14271/Python/Mac/Modules/list
Modified Files:
Listmodule.c
Log Message:
Lots more Carbon/Carbon.h includes, new UPP routine names, function prototypes. Most toolbox modules now compile, link and import in MacOSX-MachO python.
Index: Listmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/list/Listmodule.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Listmodule.c 2001/05/17 21:56:02 1.14
--- Listmodule.c 2001/05/22 21:52:49 1.15
***************
*** 9,14 ****
#include "pymactoolbox.h"
#include <Lists.h>
!
#ifdef USE_TOOLBOX_OBJECT_GLUE
--- 9,17 ----
#include "pymactoolbox.h"
+ #ifdef WITHOUT_FRAMEWORKS
#include <Lists.h>
! #else
! #include <Carbon/Carbon.h>
! #endif
#ifdef USE_TOOLBOX_OBJECT_GLUE
***************
*** 62,67 ****
} ListObject;
! PyObject *ListObj_New(itself)
! ListHandle itself;
{
ListObject *it;
--- 65,69 ----
} ListObject;
! PyObject *ListObj_New(ListHandle itself)
{
ListObject *it;
***************
*** 76,82 ****
return (PyObject *)it;
}
! ListObj_Convert(v, p_itself)
! PyObject *v;
! ListHandle *p_itself;
{
if (!ListObj_Check(v))
--- 78,82 ----
return (PyObject *)it;
}
! ListObj_Convert(PyObject *v, ListHandle *p_itself)
{
if (!ListObj_Check(v))
***************
*** 89,94 ****
}
! static void ListObj_dealloc(self)
! ListObject *self;
{
if (self->ob_must_be_disposed && self->ob_itself) LDispose(self->ob_itself);
--- 89,93 ----
}
! static void ListObj_dealloc(ListObject *self)
{
if (self->ob_must_be_disposed && self->ob_itself) LDispose(self->ob_itself);
***************
*** 96,102 ****
}
! static PyObject *ListObj_LAddColumn(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 95,99 ----
}
! static PyObject *ListObj_LAddColumn(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 116,122 ****
}
! static PyObject *ListObj_LAddRow(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 113,117 ----
}
! static PyObject *ListObj_LAddRow(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 136,142 ****
}
! static PyObject *ListObj_LDelColumn(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 131,135 ----
}
! static PyObject *ListObj_LDelColumn(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 155,161 ****
}
! static PyObject *ListObj_LDelRow(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 148,152 ----
}
! static PyObject *ListObj_LDelRow(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 174,180 ****
}
! static PyObject *ListObj_LGetSelect(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 165,169 ----
}
! static PyObject *ListObj_LGetSelect(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 195,201 ****
}
! static PyObject *ListObj_LLastClick(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 184,188 ----
}
! static PyObject *ListObj_LLastClick(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 209,215 ****
}
! static PyObject *ListObj_LNextCell(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 196,200 ----
}
! static PyObject *ListObj_LNextCell(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 233,239 ****
}
! static PyObject *ListObj_LSize(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 218,222 ----
}
! static PyObject *ListObj_LSize(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 252,258 ****
}
! static PyObject *ListObj_LSetDrawingMode(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 235,239 ----
}
! static PyObject *ListObj_LSetDrawingMode(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 268,274 ****
}
! static PyObject *ListObj_LScroll(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 249,253 ----
}
! static PyObject *ListObj_LScroll(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 287,293 ****
}
! static PyObject *ListObj_LAutoScroll(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 266,270 ----
}
! static PyObject *ListObj_LAutoScroll(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 300,306 ****
}
! static PyObject *ListObj_LUpdate(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 277,281 ----
}
! static PyObject *ListObj_LUpdate(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 316,322 ****
}
! static PyObject *ListObj_LActivate(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 291,295 ----
}
! static PyObject *ListObj_LActivate(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 332,338 ****
}
! static PyObject *ListObj_LCellSize(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 305,309 ----
}
! static PyObject *ListObj_LCellSize(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 348,354 ****
}
! static PyObject *ListObj_LClick(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 319,323 ----
}
! static PyObject *ListObj_LClick(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 368,374 ****
}
! static PyObject *ListObj_LAddToCell(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 337,341 ----
}
! static PyObject *ListObj_LAddToCell(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 391,397 ****
}
! static PyObject *ListObj_LClrCell(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 358,362 ----
}
! static PyObject *ListObj_LClrCell(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 407,413 ****
}
! static PyObject *ListObj_LGetCell(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 372,376 ----
}
! static PyObject *ListObj_LGetCell(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 436,442 ****
}
! static PyObject *ListObj_LRect(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 399,403 ----
}
! static PyObject *ListObj_LRect(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 454,460 ****
}
! static PyObject *ListObj_LSetCell(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 415,419 ----
}
! static PyObject *ListObj_LSetCell(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 477,483 ****
}
! static PyObject *ListObj_LSetSelect(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 436,440 ----
}
! static PyObject *ListObj_LSetSelect(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 496,502 ****
}
! static PyObject *ListObj_LDraw(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 453,457 ----
}
! static PyObject *ListObj_LDraw(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 512,518 ****
}
! static PyObject *ListObj_as_Resource(_self, _args)
! ListObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 467,471 ----
}
! static PyObject *ListObj_as_Resource(ListObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 578,584 ****
PyMethodChain ListObj_chain = { ListObj_methods, NULL };
! static PyObject *ListObj_getattr(self, name)
! ListObject *self;
! char *name;
{
{
--- 531,535 ----
PyMethodChain ListObj_chain = { ListObj_methods, NULL };
! static PyObject *ListObj_getattr(ListObject *self, char *name)
{
{
***************
*** 593,600 ****
static int
! ListObj_setattr(self, name, value)
! ListObject *self;
! char *name;
! PyObject *value;
{
long intval;
--- 544,548 ----
static int
! ListObj_setattr(ListObject *self, char *name, PyObject *value)
{
long intval;
***************
*** 644,650 ****
! static PyObject *List_LNew(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 592,596 ----
! static PyObject *List_LNew(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 684,690 ****
}
! static PyObject *List_GetListPort(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 630,634 ----
}
! static PyObject *List_GetListPort(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 700,706 ****
}
! static PyObject *List_GetListVerticalScrollBar(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 644,648 ----
}
! static PyObject *List_GetListVerticalScrollBar(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 716,722 ****
}
! static PyObject *List_GetListHorizontalScrollBar(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 658,662 ----
}
! static PyObject *List_GetListHorizontalScrollBar(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 732,738 ****
}
! static PyObject *List_GetListActive(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 672,676 ----
}
! static PyObject *List_GetListActive(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 748,754 ****
}
! static PyObject *List_GetListClickTime(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 686,690 ----
}
! static PyObject *List_GetListClickTime(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 764,770 ****
}
! static PyObject *List_GetListRefCon(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 700,704 ----
}
! static PyObject *List_GetListRefCon(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 780,786 ****
}
! static PyObject *List_GetListDefinition(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 714,718 ----
}
! static PyObject *List_GetListDefinition(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 796,802 ****
}
! static PyObject *List_GetListUserHandle(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 728,732 ----
}
! static PyObject *List_GetListUserHandle(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 812,818 ****
}
! static PyObject *List_GetListDataHandle(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 742,746 ----
}
! static PyObject *List_GetListDataHandle(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 828,834 ****
}
! static PyObject *List_GetListFlags(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 756,760 ----
}
! static PyObject *List_GetListFlags(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 844,850 ****
}
! static PyObject *List_GetListSelectionFlags(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 770,774 ----
}
! static PyObject *List_GetListSelectionFlags(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 860,866 ****
}
! static PyObject *List_SetListViewBounds(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 784,788 ----
}
! static PyObject *List_SetListViewBounds(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 878,884 ****
}
! static PyObject *List_SetListPort(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 800,804 ----
}
! static PyObject *List_SetListPort(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 896,902 ****
}
! static PyObject *List_SetListCellIndent(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 816,820 ----
}
! static PyObject *List_SetListCellIndent(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 914,920 ****
}
! static PyObject *List_SetListClickTime(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 832,836 ----
}
! static PyObject *List_SetListClickTime(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 932,938 ****
}
! static PyObject *List_SetListRefCon(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 848,852 ----
}
! static PyObject *List_SetListRefCon(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 950,956 ****
}
! static PyObject *List_SetListUserHandle(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 864,868 ----
}
! static PyObject *List_SetListUserHandle(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 968,974 ****
}
! static PyObject *List_SetListFlags(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 880,884 ----
}
! static PyObject *List_SetListFlags(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 986,992 ****
}
! static PyObject *List_SetListSelectionFlags(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 896,900 ----
}
! static PyObject *List_SetListSelectionFlags(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1004,1010 ****
}
! static PyObject *List_as_List(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 912,916 ----
}
! static PyObject *List_as_List(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1069,1073 ****
! void initList()
{
PyObject *m;
--- 975,979 ----
! void initList(void)
{
PyObject *m;
***************
*** 1076,1081 ****
! PyMac_INIT_TOOLBOX_OBJECT_NEW(ListObj_New);
! PyMac_INIT_TOOLBOX_OBJECT_CONVERT(ListObj_Convert);
--- 982,987 ----
! PyMac_INIT_TOOLBOX_OBJECT_NEW(ListHandle, ListObj_New);
! PyMac_INIT_TOOLBOX_OBJECT_CONVERT(ListHandle, ListObj_Convert);