[frontierkernel-commits] Frontier/Common/source osawindows.c,1.1,1.2

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

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

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

Index: osawindows.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osawindows.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osawindows.c	9 Oct 2004 07:56:07 -0000	1.1
--- osawindows.c	23 Oct 2004 22:47:36 -0000	1.2
***************
*** 26,36 ****
  /*Forked file. Carbon at top, "good" version at bottom. This file should be reconciled later.*/
  
  #if TARGET_API_MAC_CARBON == 1
  
- #include <Components.h>
  #include <uisharing.h>
  #include <uisinternal.h>
  #include <land.h>
- #include <standard.h>
  #include "ops.h"
  #include "kb.h"
--- 26,37 ----
  /*Forked file. Carbon at top, "good" version at bottom. This file should be reconciled later.*/
  
+ #include "frontier.h"
+ #include "standard.h"
+ 
  #if TARGET_API_MAC_CARBON == 1
  
  #include <uisharing.h>
  #include <uisinternal.h>
  #include <land.h>
  #include "ops.h"
  #include "kb.h"
***************
*** 403,407 ****
  	OSErr err;
  	
! 	#if TARGET_API_MAC_CARBON == 1	
  	if (handleselectwindowDesc == nil)
  		handleselectwindowDesc = NewAEEventHandlerUPP(handleselectwindow);
--- 404,408 ----
  	OSErr err;
  	
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM	
  	if (handleselectwindowDesc == nil)
  		handleselectwindowDesc = NewAEEventHandlerUPP(handleselectwindow);
***************
*** 419,423 ****
  	
  	err = AERemoveEventHandler ('SHUI', 'selw', handleselectwindowUPP, false);
! 	#if TARGET_API_MAC_CARBON == 1	
  	if (handleselectwindowDesc != nil)
  		DisposeAEEventHandlerUPP(handleselectwindowDesc);
--- 420,424 ----
  	
  	err = AERemoveEventHandler ('SHUI', 'selw', handleselectwindowUPP, false);
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM	
  	if (handleselectwindowDesc != nil)
  		DisposeAEEventHandlerUPP(handleselectwindowDesc);
***************
*** 558,562 ****
  	#endif
  	
! 	#if TARGET_API_MAC_CARBON == 1
  	windowcandofunctionDesc = NewComponentFunctionUPP(windowcandofunction, windowcandofunctionProcInfo);
  	handlewindoweventcommandDesc = NewComponentFunctionUPP(handlewindoweventcommand, handlewindoweventcommandProcInfo);
--- 559,563 ----
  	#endif
  	
! 	#if TARGET_API_MAC_CARBON && TARGET_RT_MAC_CFM
  	windowcandofunctionDesc = NewComponentFunctionUPP(windowcandofunction, windowcandofunctionProcInfo);
  	handlewindoweventcommandDesc = NewComponentFunctionUPP(handlewindoweventcommand, handlewindoweventcommandProcInfo);
***************
*** 581,589 ****
  #else
  
- #include <Components.h>
  #include <uisharing.h>
  #include <uisinternal.h>
  #include <land.h>
- #include <standard.h>
  #include "ops.h"
  #include "kb.h"
--- 582,588 ----