[frontierkernel-commits] Frontier/Common/IOAToolkit ioa.c,1.4.6.1,1.4.6.2,pre_int64_branch

[Karsten W. <kar...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/IOAToolkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16359/Common/IOAToolkit

Modified Files:
      Tag: pre_int64_branch
	ioa.c 
Log Message:
update before switch


Index: ioa.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioa.c,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -C2 -d -r1.4.6.1 -r1.4.6.2
*** ioa.c	14 Feb 2006 11:34:22 -0000	1.4.6.1
--- ioa.c	22 Mar 2006 09:11:28 -0000	1.4.6.2
***************
*** 588,626 ****
  	
  	
! static void callsetuproutine (setupcallback callback, tyioaconfigrecord *config) {
  	
! 	IOAclearbytes (config, longsizeof (tyioaconfigrecord));
  	
! 	(*config).setValueFromScriptCallback = IOAsetobjectvalue;
  	
! 	(*config).getObjectInvalRectCallback = defaultGetObjectInvalRectCallback;
  	
! 	(*config).recalcObjectCallback = defaultRecalcObjectCallback;
  	
! 	(*config).debugObjectCallback = defaultDebugObjectCallback;
  	
! 	(*config).clickObjectCallback = defaultClickObjectCallback;
  	
! 	(*config).setObjectCursorCallback = defaultSetObjectCursorCallback;
  	
! 	(*config).catchReturnCallback = defaultCatchReturnCallback;
  	
! 	(*config).getAttributesCallback = defaultAppleEventCallback;
  	
! 	(*config).setAttributesCallback = defaultAppleEventCallback;
  	
! 	(*config).packDataCallback = defaultPackDataCallback;
  	
! 	(*config).unpackDataCallback = defaultUnpackDataCallback;
  	
! 	(*config).disposeDataCallback = defaultDisposeDataCallback;
  	
! 	(*config).handlesMouseTrack = false;
  	
! 	(*config).editableInRunMode = false;
  	
! 	(*config).isFontAware = true;
  	
! 	(*callback) (config);
  	} /*callsetuproutine*/
  
--- 588,626 ----
  	
  	
! static void callsetuproutine (setupcallback pcallback, tyioaconfigrecord *pconfig) {
  	
! 	IOAclearbytes (pconfig, longsizeof (tyioaconfigrecord));
  	
! 	(*pconfig).setValueFromScriptCallback = IOAsetobjectvalue;
  	
! 	(*pconfig).getObjectInvalRectCallback = defaultGetObjectInvalRectCallback;
  	
! 	(*pconfig).recalcObjectCallback = defaultRecalcObjectCallback;
  	
! 	(*pconfig).debugObjectCallback = defaultDebugObjectCallback;
  	
! 	(*pconfig).clickObjectCallback = defaultClickObjectCallback;
  	
! 	(*pconfig).setObjectCursorCallback = defaultSetObjectCursorCallback;
  	
! 	(*pconfig).catchReturnCallback = defaultCatchReturnCallback;
  	
! 	(*pconfig).getAttributesCallback = defaultAppleEventCallback;
  	
! 	(*pconfig).setAttributesCallback = defaultAppleEventCallback;
  	
! 	(*pconfig).packDataCallback = defaultPackDataCallback;
  	
! 	(*pconfig).unpackDataCallback = defaultUnpackDataCallback;
  	
! 	(*pconfig).disposeDataCallback = defaultDisposeDataCallback;
  	
! 	(*pconfig).handlesMouseTrack = false;
  	
! 	(*pconfig).editableInRunMode = false;
  	
! 	(*pconfig).isFontAware = true;
  	
! 	(*pcallback) (pconfig);
  	} /*callsetuproutine*/
  
***************
*** 1295,1298 ****
--- 1295,1301 ----
  	//I changed this to plain pascal instead of static. Will this shoot things?
  static	pascal ComponentResult IOAmain (ComponentParameters *params, Handle hstorage) {
+ #if TARGET_API_MAC_CARBON
+ #pragma unused(hstorage)
+ #endif
  
  #endif
***************
*** 1812,1816 ****
  		
  	
! 	static boolean IOAregister (short ixarray, OSType subtype, ComponentRoutine main, setupcallback callback) {
  		
  		ComponentDescription desc;
--- 1815,1819 ----
  		
  	
! 	static boolean IOAregister (short ixarray, OSType subtype, ComponentRoutine main, setupcallback pcallback) {
  		
  		ComponentDescription desc;
***************
*** 1818,1822 ****
  		ComponentRoutineUPP routinePtr;
  		
! 		callsetuproutine (callback, &configarray [ixarray]);
  		
  		IOAclearbytes (&desc, longsizeof (desc));
--- 1821,1825 ----
  		ComponentRoutineUPP routinePtr;
  		
! 		callsetuproutine (pcallback, &configarray [ixarray]);
  		
  		IOAclearbytes (&desc, longsizeof (desc));