[Python-checkins] CVS: python/dist/src/Mac/Modules/ctl ctlsupport.py,1.38,1.39

[Jack Jansen]

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

Modified Files:
	ctlsupport.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: ctlsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctl/ctlsupport.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** ctlsupport.py	2001/05/17 21:54:55	1.38
--- ctlsupport.py	2001/05/22 21:51:49	1.39
***************
*** 50,56 ****
  
  includestuff = includestuff + """
! #include <%s>""" % MACHEADERFILE + """
! #ifndef kControlCheckBoxUncheckedValue
  #include <ControlDefinitions.h>
  #endif
  
--- 50,58 ----
  
  includestuff = includestuff + """
! #ifdef WITHOUT_FRAMEWORKS
! #include <Controls.h>
  #include <ControlDefinitions.h>
+ #else
+ #include <Carbon/Carbon.h>
  #endif
  
***************
*** 78,83 ****
  #if 0 /* Not needed */
  static PyObject *
! ControlFontStyle_New(itself)
! 	ControlFontStyleRec *itself;
  {
  
--- 80,84 ----
  #if 0 /* Not needed */
  static PyObject *
! ControlFontStyle_New(ControlFontStyleRec *itself)
  {
  
***************
*** 89,95 ****
  
  static int
! ControlFontStyle_Convert(v, itself)
! 	PyObject *v;
! 	ControlFontStyleRec *itself;
  {
  	return PyArg_ParseTuple(v, "hhhhhhO&O&", &itself->flags,
--- 90,94 ----
  
  static int
! ControlFontStyle_Convert(PyObject *v, ControlFontStyleRec *itself)
  {
  	return PyArg_ParseTuple(v, "hhhhhhO&O&", &itself->flags,
***************
*** 103,108 ****
  */
  static PyObject *
! PyControlID_New(itself)
! 	ControlID *itself;
  {
  
--- 102,106 ----
  */
  static PyObject *
! PyControlID_New(ControlID *itself)
  {
  
***************
*** 111,117 ****
  
  static int
! PyControlID_Convert(v, itself)
! 	PyObject *v;
! 	ControlID *itself;
  {
  	return PyArg_ParseTuple(v, "O&l", PyMac_GetOSType, &itself->signature, &itself->id);
--- 109,113 ----
  
  static int
! PyControlID_Convert(PyObject *v, ControlID *itself)
  {
  	return PyArg_ParseTuple(v, "O&l", PyMac_GetOSType, &itself->signature, &itself->id);
***************
*** 134,139 ****
  finalstuff = finalstuff + """
  static PyObject *
! CtlObj_NewUnmanaged(itself)
! 	ControlHandle itself;
  {
  	ControlObject *it;
--- 130,134 ----
  finalstuff = finalstuff + """
  static PyObject *
! CtlObj_NewUnmanaged(ControlHandle itself)
  {
  	ControlObject *it;
***************
*** 167,172 ****
  
  static int
! settrackfunc(obj)
! 	PyObject *obj;
  {
  	if (tracker) {
--- 162,166 ----
  
  static int
! settrackfunc(PyObject *obj)
  {
  	if (tracker) {
***************
*** 179,183 ****
  
  static void
! clrtrackfunc()
  {
  	Py_XDECREF(tracker);
--- 173,177 ----
  
  static void
! clrtrackfunc(void)
  {
  	Py_XDECREF(tracker);
***************
*** 202,210 ****
  
  static int
! setcallback(myself, which, callback, uppp)
! 	PyObject *myself;
! 	OSType which;
! 	PyObject *callback;
! 	UniversalProcPtr *uppp;
  {
  	ControlObject *self = (ControlObject *)myself;
--- 196,200 ----
  
  static int
! setcallback(PyObject *myself, OSType which, PyObject *callback, UniversalProcPtr *uppp)
  {
  	ControlObject *self = (ControlObject *)myself;
***************
*** 236,243 ****
  
  static PyObject *
! callcallback(self, which, arglist)
! 	ControlObject *self;
! 	OSType which;
! 	PyObject *arglist;
  {
  	char keybuf[9];
--- 226,230 ----
  
  static PyObject *
! callcallback(ControlObject *self, OSType which, PyObject *arglist)
  {
  	char keybuf[9];
***************
*** 320,330 ****
  
  initstuff = initstuff + """
! mytracker_upp = NewControlActionProc(mytracker);
! mydrawproc_upp = NewControlUserPaneDrawProc(mydrawproc);
! myidleproc_upp = NewControlUserPaneIdleProc(myidleproc);
! myhittestproc_upp = NewControlUserPaneHitTestProc(myhittestproc);
! mytrackingproc_upp = NewControlUserPaneTrackingProc(mytrackingproc);
! PyMac_INIT_TOOLBOX_OBJECT_NEW(CtlObj_New);
! PyMac_INIT_TOOLBOX_OBJECT_CONVERT(CtlObj_Convert);
  """
  
--- 307,317 ----
  
  initstuff = initstuff + """
! mytracker_upp = NewControlActionUPP(mytracker);
! mydrawproc_upp = NewControlUserPaneDrawUPP(mydrawproc);
! myidleproc_upp = NewControlUserPaneIdleUPP(myidleproc);
! myhittestproc_upp = NewControlUserPaneHitTestUPP(myhittestproc);
! mytrackingproc_upp = NewControlUserPaneTrackingUPP(mytrackingproc);
! PyMac_INIT_TOOLBOX_OBJECT_NEW(ControlHandle, CtlObj_New);
! PyMac_INIT_TOOLBOX_OBJECT_CONVERT(ControlHandle, CtlObj_Convert);
  """