[Python-checkins] CVS: python/dist/src/Mac/Modules/icn Icnmodule.c,1.7,1.8
Jack Jansen
jackjansen@users.sourceforge.net
Tue, 22 May 2001 14:52:40 -0700
Update of /cvsroot/python/python/dist/src/Mac/Modules/icn
In directory usw-pr-cvs1:/tmp/cvs-serv14202/Python/Mac/Modules/icn
Modified Files:
Icnmodule.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: Icnmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/icn/Icnmodule.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Icnmodule.c 2000/12/10 23:43:42 1.7
--- Icnmodule.c 2001/05/22 21:52:38 1.8
***************
*** 9,19 ****
#include "pymactoolbox.h"
#include <Icons.h>
static PyObject *Icn_Error;
! static PyObject *Icn_GetCIcon(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 9,22 ----
#include "pymactoolbox.h"
+ #ifdef WITHOUT_FRAMEWORKS
#include <Icons.h>
+ #else
+ #include <Carbon/Carbon.h>
+ #endif
+
static PyObject *Icn_Error;
! static PyObject *Icn_GetCIcon(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 29,35 ****
}
! static PyObject *Icn_PlotCIcon(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 32,36 ----
}
! static PyObject *Icn_PlotCIcon(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 47,53 ****
}
! static PyObject *Icn_DisposeCIcon(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 48,52 ----
}
! static PyObject *Icn_DisposeCIcon(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 62,68 ****
}
! static PyObject *Icn_GetIcon(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 61,65 ----
}
! static PyObject *Icn_GetIcon(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 78,84 ****
}
! static PyObject *Icn_PlotIcon(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 75,79 ----
}
! static PyObject *Icn_PlotIcon(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 96,102 ****
}
! static PyObject *Icn_PlotIconID(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 91,95 ----
}
! static PyObject *Icn_PlotIconID(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 122,128 ****
}
! static PyObject *Icn_NewIconSuite(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 115,119 ----
}
! static PyObject *Icn_NewIconSuite(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 138,144 ****
}
! static PyObject *Icn_AddIconToSuite(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 129,133 ----
}
! static PyObject *Icn_AddIconToSuite(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 161,167 ****
}
! static PyObject *Icn_GetIconFromSuite(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 150,154 ----
}
! static PyObject *Icn_GetIconFromSuite(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 183,189 ****
}
! static PyObject *Icn_GetIconSuite(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 170,174 ----
}
! static PyObject *Icn_GetIconSuite(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 205,211 ****
}
! static PyObject *Icn_DisposeIconSuite(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 190,194 ----
}
! static PyObject *Icn_DisposeIconSuite(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 225,231 ****
}
! static PyObject *Icn_PlotIconSuite(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 208,212 ----
}
! static PyObject *Icn_PlotIconSuite(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 251,257 ****
}
! static PyObject *Icn_LoadIconCache(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 232,236 ----
}
! static PyObject *Icn_LoadIconCache(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 277,283 ****
}
! static PyObject *Icn_GetLabel(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 256,260 ----
}
! static PyObject *Icn_GetLabel(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 299,305 ****
}
! static PyObject *Icn_PtInIconID(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 276,280 ----
}
! static PyObject *Icn_PtInIconID(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 324,330 ****
}
! static PyObject *Icn_PtInIconSuite(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 299,303 ----
}
! static PyObject *Icn_PtInIconSuite(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 349,355 ****
}
! static PyObject *Icn_RectInIconID(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 322,326 ----
}
! static PyObject *Icn_RectInIconID(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 374,380 ****
}
! static PyObject *Icn_RectInIconSuite(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 345,349 ----
}
! static PyObject *Icn_RectInIconSuite(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 399,405 ****
}
! static PyObject *Icn_IconIDToRgn(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 368,372 ----
}
! static PyObject *Icn_IconIDToRgn(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 425,431 ****
}
! static PyObject *Icn_IconSuiteToRgn(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 392,396 ----
}
! static PyObject *Icn_IconSuiteToRgn(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 451,457 ****
}
! static PyObject *Icn_SetSuiteLabel(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 416,420 ----
}
! static PyObject *Icn_SetSuiteLabel(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 471,477 ****
}
! static PyObject *Icn_GetSuiteLabel(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 434,438 ----
}
! static PyObject *Icn_GetSuiteLabel(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 487,493 ****
}
! static PyObject *Icn_PlotIconHandle(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 448,452 ----
}
! static PyObject *Icn_PlotIconHandle(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 513,519 ****
}
! static PyObject *Icn_PlotSICNHandle(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 472,476 ----
}
! static PyObject *Icn_PlotSICNHandle(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 539,545 ****
}
! static PyObject *Icn_PlotCIconHandle(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 496,500 ----
}
! static PyObject *Icn_PlotCIconHandle(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 567,573 ****
#if !TARGET_API_MAC_CARBON
! static PyObject *Icn_IconServicesTerminate(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 522,526 ----
#if !TARGET_API_MAC_CARBON
! static PyObject *Icn_IconServicesTerminate(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 581,587 ****
#endif
! static PyObject *Icn_IconRefToIconFamily(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 534,538 ----
#endif
! static PyObject *Icn_IconRefToIconFamily(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 603,609 ****
}
! static PyObject *Icn_IconFamilyToIconSuite(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 554,558 ----
}
! static PyObject *Icn_IconFamilyToIconSuite(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 625,631 ****
}
! static PyObject *Icn_IconSuiteToIconFamily(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 574,578 ----
}
! static PyObject *Icn_IconSuiteToIconFamily(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 647,653 ****
}
! static PyObject *Icn_SetIconFamilyData(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 594,598 ----
}
! static PyObject *Icn_SetIconFamilyData(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 670,676 ****
}
! static PyObject *Icn_GetIconFamilyData(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 615,619 ----
}
! static PyObject *Icn_GetIconFamilyData(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 693,699 ****
}
! static PyObject *Icn_GetIconRefOwners(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 636,640 ----
}
! static PyObject *Icn_GetIconRefOwners(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 712,718 ****
}
! static PyObject *Icn_AcquireIconRef(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 653,657 ----
}
! static PyObject *Icn_AcquireIconRef(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 729,735 ****
}
! static PyObject *Icn_ReleaseIconRef(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 668,672 ----
}
! static PyObject *Icn_ReleaseIconRef(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 746,752 ****
}
! static PyObject *Icn_GetIconRefFromFile(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 683,687 ----
}
! static PyObject *Icn_GetIconRefFromFile(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 768,774 ****
}
! static PyObject *Icn_GetIconRef(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 703,707 ----
}
! static PyObject *Icn_GetIconRef(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 793,799 ****
}
! static PyObject *Icn_GetIconRefFromFolder(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 726,730 ----
}
! static PyObject *Icn_GetIconRefFromFolder(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 824,830 ****
}
! static PyObject *Icn_RegisterIconRefFromIconFamily(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 755,759 ----
}
! static PyObject *Icn_RegisterIconRefFromIconFamily(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 849,855 ****
}
! static PyObject *Icn_RegisterIconRefFromResource(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 778,782 ----
}
! static PyObject *Icn_RegisterIconRefFromResource(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 877,883 ****
}
! static PyObject *Icn_UnregisterIconRef(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 804,808 ----
}
! static PyObject *Icn_UnregisterIconRef(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 897,903 ****
}
! static PyObject *Icn_UpdateIconRef(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 822,826 ----
}
! static PyObject *Icn_UpdateIconRef(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 914,920 ****
}
! static PyObject *Icn_OverrideIconRefFromResource(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 837,841 ----
}
! static PyObject *Icn_OverrideIconRefFromResource(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 937,943 ****
}
! static PyObject *Icn_OverrideIconRef(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 858,862 ----
}
! static PyObject *Icn_OverrideIconRef(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 957,963 ****
}
! static PyObject *Icn_RemoveIconRefOverride(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 876,880 ----
}
! static PyObject *Icn_RemoveIconRefOverride(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 974,980 ****
}
! static PyObject *Icn_CompositeIconRef(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 891,895 ----
}
! static PyObject *Icn_CompositeIconRef(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 996,1002 ****
}
! static PyObject *Icn_IsIconRefComposite(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 911,915 ----
}
! static PyObject *Icn_IsIconRefComposite(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1018,1024 ****
}
! static PyObject *Icn_IsValidIconRef(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 931,935 ----
}
! static PyObject *Icn_IsValidIconRef(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1034,1040 ****
}
! static PyObject *Icn_PlotIconRef(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 945,949 ----
}
! static PyObject *Icn_PlotIconRef(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1063,1069 ****
}
! static PyObject *Icn_PtInIconRef(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 972,976 ----
}
! static PyObject *Icn_PtInIconRef(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1091,1097 ****
}
! static PyObject *Icn_RectInIconRef(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 998,1002 ----
}
! static PyObject *Icn_RectInIconRef(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1119,1125 ****
}
! static PyObject *Icn_IconRefToRgn(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1024,1028 ----
}
! static PyObject *Icn_IconRefToRgn(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1148,1154 ****
}
! static PyObject *Icn_GetIconSizesFromIconRef(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1051,1055 ----
}
! static PyObject *Icn_GetIconSizesFromIconRef(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1173,1179 ****
}
! static PyObject *Icn_FlushIconRefs(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1074,1078 ----
}
! static PyObject *Icn_FlushIconRefs(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1193,1199 ****
}
! static PyObject *Icn_FlushIconRefsByVolume(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1092,1096 ----
}
! static PyObject *Icn_FlushIconRefsByVolume(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1210,1216 ****
}
! static PyObject *Icn_SetCustomIconsEnabled(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1107,1111 ----
}
! static PyObject *Icn_SetCustomIconsEnabled(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1230,1236 ****
}
! static PyObject *Icn_GetCustomIconsEnabled(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1125,1129 ----
}
! static PyObject *Icn_GetCustomIconsEnabled(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1249,1255 ****
}
! static PyObject *Icn_IsIconRefMaskEmpty(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1142,1146 ----
}
! static PyObject *Icn_IsIconRefMaskEmpty(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1267,1273 ****
#if TARGET_API_MAC_CARBON
! static PyObject *Icn_GetIconRefVariant(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1158,1162 ----
#if TARGET_API_MAC_CARBON
! static PyObject *Icn_GetIconRefVariant(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1292,1298 ****
#if TARGET_API_MAC_CARBON
! static PyObject *Icn_RegisterIconRefFromIconFile(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1181,1185 ----
#if TARGET_API_MAC_CARBON
! static PyObject *Icn_RegisterIconRefFromIconFile(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1320,1326 ****
#if TARGET_API_MAC_CARBON
! static PyObject *Icn_ReadIconFile(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1207,1211 ----
#if TARGET_API_MAC_CARBON
! static PyObject *Icn_ReadIconFile(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1342,1348 ****
#if TARGET_API_MAC_CARBON
! static PyObject *Icn_WriteIconFile(_self, _args)
! PyObject *_self;
! PyObject *_args;
{
PyObject *_res = NULL;
--- 1227,1231 ----
#if TARGET_API_MAC_CARBON
! static PyObject *Icn_WriteIconFile(PyObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
***************
*** 1507,1511 ****
! void initIcn()
{
PyObject *m;
--- 1390,1394 ----
! void initIcn(void)
{
PyObject *m;