[frontierkernel-commits] Frontier/Common/source shellscroll.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-serv11115/Frontier/Common/source

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

Index: shellscroll.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellscroll.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shellscroll.c	9 Oct 2004 08:03:59 -0000	1.1
--- shellscroll.c	23 Oct 2004 22:55:53 -0000	1.2
***************
*** 24,34 ****
  ******************************************************************************/
  
! #ifdef MACVERSION 
! #include <standard.h>
! #endif
! 
! #ifdef WIN95VERSION 
  #include "standard.h"
- #endif
  
  #include "scrollbar.h"
--- 24,29 ----
  ******************************************************************************/
  
! #include "frontier.h"
  #include "standard.h"
  
  #include "scrollbar.h"
***************
*** 283,316 ****
  //Changed to Opaque call for Carbon
  
! #if !TARGET_RT_MAC_CFM
! 	
! 	#define shellvertscrollUPP (&shellvertscroll)
! 	
! 	#define shellhorizscrollUPP (&shellhorizscroll)
! 	
! #else
! 
  	#if TARGET_API_MAC_CARBON
! 	ControlActionUPP	shellvertscrollDesc;
! 	
! 	ControlActionUPP	shellhorizscrollDesc;
! 	
! 	ControlActionUPP	shelllivescrollupp;
! 	
! 	#define shellvertscrollUPP (shellvertscrollDesc)
! 	
! 	#define shellhorizscrollUPP (shellhorizscrollDesc)
! 	
  	#else
! 	static RoutineDescriptor shellvertscrollDesc = BUILD_ROUTINE_DESCRIPTOR (uppControlActionProcInfo, shellvertscroll);
! 	
! 	static RoutineDescriptor shellhorizscrollDesc = BUILD_ROUTINE_DESCRIPTOR (uppControlActionProcInfo, shellhorizscroll);
! 	
! 	#define shellvertscrollUPP (&shellvertscrollDesc)
! 	
! 	#define shellhorizscrollUPP (&shellhorizscrollDesc)
  	#endif
- 	
  #endif
  #if TARGET_API_MAC_CARBON == 1
  
--- 278,300 ----
  //Changed to Opaque call for Carbon
  
! #if TARGET_RT_MAC_MACHO
! 	#define shellvertscrollUPP	(&shellvertscroll)
! 	#define shellhorizscrollUPP	(&shellhorizscroll)
! 	#define	shelllivescrollupp	(&ScrollThumbActionProc)
! #elif TARGET_RT_MAC_CFM
  	#if TARGET_API_MAC_CARBON
! 		ControlActionUPP	shellvertscrollDesc;
! 		ControlActionUPP	shellhorizscrollDesc;
! 		ControlActionUPP	shelllivescrollupp;
! 		#define shellvertscrollUPP (shellvertscrollDesc)
! 		#define shellhorizscrollUPP (shellhorizscrollDesc)
  	#else
! 		static RoutineDescriptor shellvertscrollDesc = BUILD_ROUTINE_DESCRIPTOR (uppControlActionProcInfo, shellvertscroll);
! 		static RoutineDescriptor shellhorizscrollDesc = BUILD_ROUTINE_DESCRIPTOR (uppControlActionProcInfo, shellhorizscroll);
! 		#define shellvertscrollUPP (&shellvertscrollDesc)
! 		#define shellhorizscrollUPP (&shellhorizscrollDesc)
  	#endif
  #endif
+ 
  #if TARGET_API_MAC_CARBON == 1
  
***************
*** 551,557 ****
  	//Needed in shellscroll
  	#if TARGET_API_MAC_CARBON
! 	shellvertscrollDesc = NewControlActionUPP(shellvertscroll);
! 	shellhorizscrollDesc = NewControlActionUPP(shellhorizscroll);
! 	shelllivescrollupp = NewControlActionUPP (ScrollThumbActionProc);
  	#endif
  }
--- 535,543 ----
  	//Needed in shellscroll
  	#if TARGET_API_MAC_CARBON
! 		#if TARGET_RT_MAC_CFM
! 			shellvertscrollDesc = NewControlActionUPP(shellvertscroll);
! 			shellhorizscrollDesc = NewControlActionUPP(shellhorizscroll);
! 			shelllivescrollupp = NewControlActionUPP (ScrollThumbActionProc);
! 		#endif
  	#endif
  }
***************
*** 562,573 ****
  {
  	#if TARGET_API_MAC_CARBON
! 	DisposeControlActionUPP(shellvertscrollDesc);
! 	DisposeControlActionUPP(shellhorizscrollDesc);
! 	DisposeControlActionUPP (shelllivescrollupp);
  	#endif
  }
  
  
- 
  void shellscroll (boolean flvert, hdlscrollbar sb, short part, Point pt) {
  	
--- 548,560 ----
  {
  	#if TARGET_API_MAC_CARBON
! 		#if TARGET_RT_MAC_CFM
! 			DisposeControlActionUPP(shellvertscrollDesc);
! 			DisposeControlActionUPP(shellhorizscrollDesc);
! 			DisposeControlActionUPP (shelllivescrollupp);
! 		#endif
  	#endif
  }
  
  
  void shellscroll (boolean flvert, hdlscrollbar sb, short part, Point pt) {