[Python-checkins] CVS: python/dist/src/Mac/Modules/drag dragsupport.py,1.5,1.6

Jack Jansen jackjansen@users.sourceforge.net
Tue, 22 May 2001 14:52:10 -0700


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

Modified Files:
	dragsupport.py 
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: dragsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/drag/dragsupport.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** dragsupport.py	2001/05/17 21:55:37	1.5
--- dragsupport.py	2001/05/22 21:52:08	1.6
***************
*** 45,49 ****
  
  includestuff = includestuff + """
! #include <%s>""" % MACHEADERFILE + """
  
  /* Callback glue routines */
--- 45,53 ----
  
  includestuff = includestuff + """
! #ifdef WITHOUT_FRAMEWORKS
! #include <Drag.h>
! #else
! #include <Carbon/Carbon.h>
! #endif
  
  /* Callback glue routines */
***************
*** 163,177 ****
  
  initstuff = initstuff + """
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(DragObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(DragObj_Convert);
  """
  
  variablestuff = """
! dragglue_TrackingHandlerUPP = NewDragTrackingHandlerProc(dragglue_TrackingHandler);
! dragglue_ReceiveHandlerUPP = NewDragReceiveHandlerProc(dragglue_ReceiveHandler);
! dragglue_SendDataUPP = NewDragSendDataProc(dragglue_SendData);
  #if 0
! dragglue_InputUPP = NewDragInputProc(dragglue_Input);
! dragglue_DrawingUPP = NewDragDrawingProc(dragglue_Drawing);
  #endif
  """    
--- 167,181 ----
  
  initstuff = initstuff + """
! 	PyMac_INIT_TOOLBOX_OBJECT_NEW(DragRef, DragObj_New);
! 	PyMac_INIT_TOOLBOX_OBJECT_CONVERT(DragRef, DragObj_Convert);
  """
  
  variablestuff = """
! dragglue_TrackingHandlerUPP = NewDragTrackingHandlerUPP(dragglue_TrackingHandler);
! dragglue_ReceiveHandlerUPP = NewDragReceiveHandlerUPP(dragglue_ReceiveHandler);
! dragglue_SendDataUPP = NewDragSendDataUPP(dragglue_SendData);
  #if 0
! dragglue_InputUPP = NewDragInputUPP(dragglue_Input);
! dragglue_DrawingUPP = NewDragDrawingUPP(dragglue_Drawing);
  #endif
  """