[Python-checkins] python/dist/src/Mac/Modules/ibcarbon IBCarbonscan.py,1.1,1.2 _IBCarbon.c,1.1,1.2

[jackjansen@users.sourceforge.net]

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

Modified Files:
	IBCarbonscan.py _IBCarbon.c 
Log Message:
Updated to something that works on my system, and regenerated module.


Index: IBCarbonscan.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ibcarbon/IBCarbonscan.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IBCarbonscan.py	4 Aug 2002 21:34:24 -0000	1.1
--- IBCarbonscan.py	4 Aug 2002 21:59:37 -0000	1.2
***************
*** 6,10 ****
  import MacOS
  
! BGENDIR= '/Users/dp/python/dist/src/Tools/bgen/bgen'
  sys.path.append(BGENDIR)
  print sys.path, sys.prefix
--- 6,10 ----
  import MacOS
  
! BGENDIR= '/Users/jack/src/python/Tools/bgen/bgen'
  sys.path.append(BGENDIR)
  print sys.path, sys.prefix
***************
*** 26,29 ****
--- 26,30 ----
  
  class IBCarbon_Scanner(Scanner_OSX):
+ 
  	def destination(self, type, name, arglist):
  		classname = "IBCarbonFunction"
***************
*** 41,44 ****
--- 42,49 ----
  			"CreateNibReferenceWithCFBundle",  ## need to wrap CFBundle.h properly first
  			]
+ 			
+ 	def makerepairinstructions(self):
+ 		return []
+ 
  
  if __name__ == "__main__":

Index: _IBCarbon.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ibcarbon/_IBCarbon.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** _IBCarbon.c	4 Aug 2002 21:34:24 -0000	1.1
--- _IBCarbon.c	4 Aug 2002 21:59:37 -0000	1.2
***************
*** 56,60 ****
  {
  	DisposeNibReference(self->ob_itself);
! 	PyMem_DEL(self);
  }
  
--- 56,60 ----
  {
  	DisposeNibReference(self->ob_itself);
! 	PyObject_Del(self);
  }
  
***************
*** 68,76 ****
  	                      CFStringRefObj_Convert, &inName))
  		return NULL;
- 	Py_BEGIN_ALLOW_THREADS
  	_err = CreateWindowFromNib(_self->ob_itself,
  	                           inName,
  	                           &outWindow);
- 	Py_END_ALLOW_THREADS
  	if (_err != noErr) return PyMac_Error(_err);
  	_res = Py_BuildValue("O&",
--- 68,74 ----
***************
*** 88,96 ****
  	                      CFStringRefObj_Convert, &inName))
  		return NULL;
- 	Py_BEGIN_ALLOW_THREADS
  	_err = CreateMenuFromNib(_self->ob_itself,
  	                         inName,
  	                         &outMenuRef);
- 	Py_END_ALLOW_THREADS
  	if (_err != noErr) return PyMac_Error(_err);
  	_res = Py_BuildValue("O&",
--- 86,92 ----
***************
*** 108,116 ****
  	                      CFStringRefObj_Convert, &inName))
  		return NULL;
- 	Py_BEGIN_ALLOW_THREADS
  	_err = CreateMenuBarFromNib(_self->ob_itself,
  	                            inName,
  	                            &outMenuBar);
- 	Py_END_ALLOW_THREADS
  	if (_err != noErr) return PyMac_Error(_err);
  	_res = Py_BuildValue("O&",
--- 104,110 ----
***************
*** 127,134 ****
  	                      CFStringRefObj_Convert, &inName))
  		return NULL;
- 	Py_BEGIN_ALLOW_THREADS
  	_err = SetMenuBarFromNib(_self->ob_itself,
  	                         inName);
- 	Py_END_ALLOW_THREADS
  	if (_err != noErr) return PyMac_Error(_err);
  	Py_INCREF(Py_None);
--- 121,126 ----
***************
*** 195,202 ****
  	                      CFStringRefObj_Convert, &inNibName))
  		return NULL;
- 	Py_BEGIN_ALLOW_THREADS
  	_err = CreateNibReference(inNibName,
  	                          &outNibRef);
- 	Py_END_ALLOW_THREADS
  	if (_err != noErr) return PyMac_Error(_err);
  	_res = Py_BuildValue("O&",
--- 187,192 ----