[frontierkernel-commits] Frontier/Common/source langverbs.c,1.2,1.3

[Andre R. <and...@us...>]

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

Modified Files:
	langverbs.c 
Log Message:
Sanitized global includes. Include frontier.h in all source files. Move inclusion of system header files into osincludes.h.

Index: langverbs.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langverbs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langverbs.c	17 Oct 2004 12:34:40 -0000	1.2
--- langverbs.c	23 Oct 2004 22:33:15 -0000	1.3
***************
*** 24,37 ****
  ******************************************************************************/
  
!  
! #include <stdlib.h>
  
  #ifdef MACVERSION
- #include <standard.h>
  #include "langxcmd.h"
  #endif
  
  #ifdef WIN95VERSION
- #include "standard.h"
  #include "htmlcontrol.h"
  #endif
--- 24,35 ----
  ******************************************************************************/
  
! #include "frontier.h"
! #include "standard.h"
  
  #ifdef MACVERSION
  #include "langxcmd.h"
  #endif
  
  #ifdef WIN95VERSION
  #include "htmlcontrol.h"
  #endif
***************
*** 1377,1388 ****
  
  #if MACVERSION
! //Code change by Timothy Paustian Wednesday, June 14, 2000 9:05:27 PM
! //Changed to Opaque call for Carbon
  #if !TARGET_RT_MAC_CFM
  		
! 		#define xcmdcallbackUPP ((UniversalProcPtr) &xcmdcallback)
  		
! 	#else
! 		enum {
  		XCmdProcInfo = kPascalStackBased
  			 | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(XCmdPtr)))
--- 1375,1412 ----
  
  #if MACVERSION
! 
! #if TARGET_API_MAC_CARBON
! 
! static boolean callxcmdverb (hdltreenode hparam1, tyvaluerecord *vreturned) {
! 
! 	/*
! 	2004-10-21 aradke: XCMDs and XCFNs are not supported on OS X
! 	*/
! 	
! 	bigstring bssourcemessage = "\pCan't call Ò^0Ó because XCMDs and XFCNs are not supported in the Carbon version.";
! 	bigstring bserrormessage;
! 	bigstring bsxcmd;
! 	hdlhashtable htable;
! 	tyvaluerecord val;
! 	hdlhashnode hnode;
! 
! 	if (!getvarvalue (hparam1, 1, &htable, bsxcmd, &val, &hnode))
! 		return (false);
! 
! 	parsedialogstring (bssourcemessage, bsxcmd, nil, nil, nil, bserrormessage);
! 	
! 	langerrormessage (bserrormessage);
! 	return (false);
! 
! 	} /*callxcmdverb*/
! 
! #else
! 
  #if !TARGET_RT_MAC_CFM
  		
! 	#define xcmdcallbackUPP ((UniversalProcPtr) &xcmdcallback)
  		
! #else
! 	enum {
  		XCmdProcInfo = kPascalStackBased
  			 | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(XCmdPtr)))
***************
*** 1393,1406 ****
  	};
  	
- 	#if TARGET_API_MAC_CARBON == 1
- 	//lets try being lazy with this one.
- 	
- 	#define xcmdcallbackUPP ((UniversalProcPtr) &xcmdcallback)
- 	#else
  	static RoutineDescriptor xcmdcallbackDesc = BUILD_ROUTINE_DESCRIPTOR (xcmdcallbackProcInfo, xcmdcallback);
  	
  	#define xcmdcallbackUPP (&xcmdcallbackDesc)
- 	#endif
  #endif
  static boolean callxcmdverb (hdltreenode hparam1, tyvaluerecord *vreturned) {
  	
--- 1417,1425 ----
  	};
  	
  	static RoutineDescriptor xcmdcallbackDesc = BUILD_ROUTINE_DESCRIPTOR (xcmdcallbackProcInfo, xcmdcallback);
  	
  	#define xcmdcallbackUPP (&xcmdcallbackDesc)
  #endif
+ 
  static boolean callxcmdverb (hdltreenode hparam1, tyvaluerecord *vreturned) {
  	
***************
*** 1440,1457 ****
  		return (false);
  		}
- 
- 	#if TARGET_API_MAC_CARBON == 1 /*7.0b48 PBS: it's an error on OS X*/
- 	
- 		{
- 		bigstring bssourcemessage = "\pCan't call Ò^0Ó because XCMDs and XFCNs are not supported in the Carbon version.";
- 		bigstring bserrormessage;
- 	
- 		parsedialogstring (bssourcemessage, bsxcmd, nil, nil, nil, bserrormessage);
- 		
- 		langerrormessage (bserrormessage);
- 		return (false);
- 		}
- 		
- 	#endif
  		
  	hxcmd = val.data.binaryvalue; /*copy into register*/
--- 1459,1462 ----
***************
*** 1563,1566 ****
--- 1568,1572 ----
  
  #endif
+ #endif