[Python-checkins] CVS: python/dist/src/Mac/Modules/win Winmodule.c,1.34,1.35

[Jack Jansen]

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

Modified Files:
	Winmodule.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: Winmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/win/Winmodule.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** Winmodule.c	2001/05/17 21:58:27	1.34
--- Winmodule.c	2001/05/22 21:56:36	1.35
***************
*** 9,13 ****
--- 9,17 ----
  #include "pymactoolbox.h"
  
+ #ifdef WITHOUT_FRAMEWORKS
  #include <Windows.h>
+ #else
+ #include <Carbon/Carbon.h>
+ #endif
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
[...2224 lines suppressed...]
! void initWin(void)
  {
  	PyObject *m;
***************
*** 3079,3085 ****
  
  
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(WinObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(WinObj_WhichWindow);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(WinObj_Convert);
  
  
--- 2793,2799 ----
  
  
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(WindowPtr, WinObj_New);
! 		PyMac_INIT_TOOLBOX_OBJECT_NEW(WindowPtr, WinObj_WhichWindow);
! 		PyMac_INIT_TOOLBOX_OBJECT_CONVERT(WindowPtr, WinObj_Convert);