[Python-checkins] python/dist/src/Mac/Modules/ibcarbon IBCarbonsupport.py, 1.5, 1.6 _IBCarbon.c, 1.8, 1.9

[jackjansen at users.sourceforge.net]

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

Modified Files:
	IBCarbonsupport.py _IBCarbon.c 
Log Message:
Got rid of macglue.h, replacing it by pymactoolbox.h where relevant.
Cleaned up various things in the toolbox modules.


Index: IBCarbonsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ibcarbon/IBCarbonsupport.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IBCarbonsupport.py	19 Nov 2003 16:13:27 -0000	1.5
--- IBCarbonsupport.py	20 Nov 2003 13:30:57 -0000	1.6
***************
*** 11,22 ****
  includestuff = """
  #include <Carbon/Carbon.h>
! #include "macglue.h"
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
  extern int _CFStringRefObj_Convert(PyObject *, CFStringRef *);
- //#define CFStringRefObj_Convert _CFStringRefObj_Convert
  #endif
- 
- //extern int CFBundleRefObj_Convert(PyObject *, CFBundleRef *);  // need to wrap CFBundle
  
  """
--- 11,19 ----
  includestuff = """
  #include <Carbon/Carbon.h>
! #include "pymactoolbox.h"
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
  extern int _CFStringRefObj_Convert(PyObject *, CFStringRef *);
  #endif
  
  """

Index: _IBCarbon.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ibcarbon/_IBCarbon.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** _IBCarbon.c	19 Nov 2003 16:13:27 -0000	1.8
--- _IBCarbon.c	20 Nov 2003 13:30:57 -0000	1.9
***************
*** 7,18 ****
  
  #include <Carbon/Carbon.h>
! #include "macglue.h"
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
  extern int _CFStringRefObj_Convert(PyObject *, CFStringRef *);
- //#define CFStringRefObj_Convert _CFStringRefObj_Convert
  #endif
- 
- //extern int CFBundleRefObj_Convert(PyObject *, CFBundleRef *);  // need to wrap CFBundle
  
  
--- 7,15 ----
  
  #include <Carbon/Carbon.h>
! #include "pymactoolbox.h"
  
  #ifdef USE_TOOLBOX_OBJECT_GLUE
  extern int _CFStringRefObj_Convert(PyObject *, CFStringRef *);
  #endif