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

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

Index: filedialog.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/filedialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** filedialog.c	9 Oct 2004 07:22:24 -0000	1.1
--- filedialog.c	23 Oct 2004 22:17:48 -0000	1.2
***************
*** 24,48 ****
  ******************************************************************************/
  
  #ifdef MACVERSION
- #include <Files.h>
- #include <Folders.h>
- #include <Gestalt.h>
- #include <Script.h>
- #include <StandardFile.h>
- #include <standard.h>
- //Code change by Timothy Paustian Sunday, June 25, 2000 10:33:54 AM
- //We need
- #include <Navigation.h>
  #include "mac.h"
  #endif
  
- #ifdef WIN95VERSION
- #include "standard.h"
- #include <commdlg.h>
- #undef abs
- #include <shlobj.h>
- #include <objidl.h>
- #endif
- 
  #include "filealias.h"
  #include "cursor.h"
--- 24,34 ----
  ******************************************************************************/
  
+ #include "frontier.h"
+ #include "standard.h"
+ 
  #ifdef MACVERSION
  #include "mac.h"
  #endif
  
  #include "filealias.h"
  #include "cursor.h"
***************
*** 62,67 ****
  #include "langinternal.h" /*for langbackgroundtask*/
  
  #ifdef MACVERSION
! 	#include "SetUpA5.h"
  
  #define sfgetfileid 5000
--- 48,55 ----
  #include "langinternal.h" /*for langbackgroundtask*/
  
+ 
  #ifdef MACVERSION
! 
! #include "SetUpA5.h"
  
  #define sfgetfileid 5000
***************
*** 86,89 ****
--- 74,79 ----
  
  
+ #if !TARGET_API_MAC_CARBON
+ 
  static pascal short sfputfilehook (short item, DialogPtr pdialog, tysfdata *pdata) {
  	
***************
*** 421,424 ****
--- 411,415 ----
  	} /*knowntypesfilter*/
  
+ 
  		
  #if !TARGET_RT_MAC_CFM
***************
*** 453,456 ****
--- 444,450 ----
  
  #endif
+ 
+ #endif /* !TARGET_API_MAC_CARBON */
+ 
  	
  	boolean sfdialog (tysfverb sfverb, bigstring bsprompt, ptrsftypelist filetypes, tyfilespec *fspec) {
***************
*** 501,506 ****
  	OSType *types = nil;
  	Str255 bs;
! 	DlgHookYDUPP sfhook = nil;
! 	FileFilterYDUPP sffilefilter = nil;
  	tysfdata sfdata;
  	FSSpec *fs = &sfdata.sfreply.sfFile;
--- 495,500 ----
  	OSType *types = nil;
  	Str255 bs;
! 	//DlgHookYDUPP sfhook = nil;
! 	//FileFilterYDUPP sffilefilter = nil;
  	tysfdata sfdata;
  	FSSpec *fs = &sfdata.sfreply.sfFile;