[Python-checkins] CVS: python/dist/src/Mac/Modules/res Resmodule.c,1.26,1.27

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Modules/res
In directory usw-pr-cvs1:/tmp/cvs-serv14836/Python/Mac/Modules/res

Modified Files:
	Resmodule.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: Resmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/res/Resmodule.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** Resmodule.c	2001/05/17 21:57:55	1.26
--- Resmodule.c	2001/05/22 21:54:54	1.27
***************
*** 9,14 ****
--- 9,18 ----
  #include "pymactoolbox.h"
  
+ #ifdef WITHOUT_FRAMEWORKS
  #include <Resources.h>
  #include <string.h>
+ #else
+ #include <Carbon/Carbon.h>
+ #endif
  
[...1142 lines suppressed...]
  	PyObject *m;
***************
*** 1690,1697 ****
  
  
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(ResObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(ResObj_Convert);
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(OptResObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(OptResObj_Convert);
  
  
--- 1558,1565 ----
  
  
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(Handle, ResObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(Handle, ResObj_Convert);
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(Handle, OptResObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(Handle, OptResObj_Convert);