[Python-checkins] python/dist/src/Mac/Modules ColorPickermodule.c, 1.6, 1.7 Nav.c, 1.28, 1.29 OSATerminology.c, 1.3, 1.4 gestaltmodule.c, 1.9, 1.10 icgluemodule.c, 1.12, 1.13 macosmodule.c, 1.69, 1.70

[jackjansen at users.sourceforge.net]

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

Modified Files:
	ColorPickermodule.c Nav.c OSATerminology.c gestaltmodule.c 
	icgluemodule.c macosmodule.c 
Log Message:
Got rid of macglue.h, replacing it by pymactoolbox.h where relevant.
Cleaned up various things in the toolbox modules.


Index: ColorPickermodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ColorPickermodule.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ColorPickermodule.c	19 Nov 2003 15:32:46 -0000	1.6
--- ColorPickermodule.c	20 Nov 2003 13:30:55 -0000	1.7
***************
*** 24,28 ****
  #include <Carbon/Carbon.h>
  #include "Python.h"
- #include "macglue.h"
  #include "pymactoolbox.h"
  
--- 24,27 ----

Index: Nav.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/Nav.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Nav.c	19 Nov 2003 22:43:57 -0000	1.28
--- Nav.c	20 Nov 2003 13:30:55 -0000	1.29
***************
*** 31,35 ****
  
  #include "Python.h"
- #include "macglue.h"
  #include "pymactoolbox.h"
  #include <Carbon/Carbon.h>
--- 31,34 ----

Index: OSATerminology.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/OSATerminology.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OSATerminology.c	19 Nov 2003 15:32:46 -0000	1.3
--- OSATerminology.c	20 Nov 2003 13:30:55 -0000	1.4
***************
*** 8,12 ****
  */
  #include "Python.h"
! #include "macglue.h"
  
  #include <Carbon/Carbon.h>
--- 8,12 ----
  */
  #include "Python.h"
! #include "pymactoolbox.h"
  
  #include <Carbon/Carbon.h>

Index: gestaltmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/gestaltmodule.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gestaltmodule.c	19 Nov 2003 15:32:46 -0000	1.9
--- gestaltmodule.c	20 Nov 2003 13:30:55 -0000	1.10
***************
*** 26,30 ****
  
  #include "Python.h"
! #include "macglue.h"
  
  #include <Carbon/Carbon.h>
--- 26,30 ----
  
  #include "Python.h"
! #include "pymactoolbox.h"
  
  #include <Carbon/Carbon.h>

Index: icgluemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/icgluemodule.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** icgluemodule.c	19 Nov 2003 15:32:46 -0000	1.12
--- icgluemodule.c	20 Nov 2003 13:30:55 -0000	1.13
***************
*** 31,35 ****
  
  #include "Python.h"
! #include "macglue.h"
  
  extern int ResObj_Convert(PyObject *, Handle *); /* From Resmodule.c */
--- 31,35 ----
  
  #include "Python.h"
! #include "pymactoolbox.h"
  
  extern int ResObj_Convert(PyObject *, Handle *); /* From Resmodule.c */

Index: macosmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macosmodule.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** macosmodule.c	19 Nov 2003 16:34:03 -0000	1.69
--- macosmodule.c	20 Nov 2003 13:30:55 -0000	1.70
***************
*** 26,31 ****
  
  #include "Python.h"
! #include "macglue.h"
! #include "pythonresources.h"
  
  #include <Carbon/Carbon.h>
--- 26,30 ----
  
  #include "Python.h"
! #include "pymactoolbox.h"
  
  #include <Carbon/Carbon.h>