[frontierkernel-commits] Frontier/Common/source menu.c,1.2,1.3 icon.c,1.2,1.3 about.c,1.3,1.4 memory.c,1.2,1.3 services.c,1.2,1.3 main.c,1.2,1.3 mouse.c,1.2,1.3 scrollbar.c,1.2,1.3 launch.c,1.4,1.5 font.c,1.2,1.3 scripts.c,1.2,1.3 frontierdebug.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-serv14061

Modified Files:
	menu.c icon.c about.c memory.c services.c main.c mouse.c 
	scrollbar.c launch.c font.c scripts.c frontierdebug.c 
Log Message:
Fix GCC compiler warning.

Index: scrollbar.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/scrollbar.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** scrollbar.c	23 Oct 2004 22:51:11 -0000	1.2
--- scrollbar.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 84,88 ****
  	
  	#if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
! 	CGrafPtr	contrlOwner = GetControlOwner(h);
  	Rect		contrlRect;
  	
--- 84,88 ----
  	
  	#if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
! 	CGrafPtr	contrlOwner = (CGrafPtr) GetControlOwner(h);
  	Rect		contrlRect;
  	
***************
*** 104,127 ****
  	
  	
- static void invalscrollbar (hdlscrollbar hscrollbar) {
- #ifdef MACVERSION
- 	register hdlscrollbar h = hscrollbar;
- 	//Code change by Timothy Paustian Friday, May 5, 2000 10:16:35 PM
- 	//Changed to Opaque call for Carbon
- 	//This routine is never called in the PPC OT version.
- 	if (h != nil) 
- 	{	
- 		#if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
- 		Rect contrlRect;
- 		GetControlBounds(h, &contrlRect);
- 		invalrect (contrlRect);
- 		#else
- 		invalrect((**h).contrlRect);
- 		#endif
- 	}
- #endif
- 	} /*invalscrollbar*/
- 	
- 	
  boolean pointinscrollbar (Point pt, hdlscrollbar hscrollbar) {
  #ifdef MACVERSION
--- 104,107 ----
***************
*** 366,370 ****
  	getscrollbarinfo (h, &scrollinfo);
  	
! /*	if (scrollinfo.min <= scrollinfo.max) /*there's something to scroll to*/
  
  	/*7.0b17 PBS: scroll if min < max, not if min <= max.*/
--- 346,350 ----
  	getscrollbarinfo (h, &scrollinfo);
  	
! 	//if (scrollinfo.min <= scrollinfo.max) /*there's something to scroll to*/
  
  	/*7.0b17 PBS: scroll if min < max, not if min <= max.*/
***************
*** 417,421 ****
  	SetControlValue (h, min (infinity, (*scrollinfo).cur));
  	
! #if __powerc
  
  	if (flmacproportionalthumbs) /*7.0b18 PBS: proportional thumbs on Macs*/
--- 397,401 ----
  	SetControlValue (h, min (infinity, (*scrollinfo).cur));
  	
! //#if __powerc || __GNUC__
  
  	if (flmacproportionalthumbs) /*7.0b18 PBS: proportional thumbs on Macs*/
***************
*** 423,427 ****
  		SetControlViewSize (h, (*scrollinfo).pag);
  
! #endif
  	
  	scrollbarpopclip ();
--- 403,407 ----
  		SetControlViewSize (h, (*scrollinfo).pag);
  
! //#endif
  	
  	scrollbarpopclip ();

Index: font.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/font.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** font.c	23 Oct 2004 22:20:03 -0000	1.2
--- font.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 425,434 ****
  
  
! /*
  void fontstring (short fontnum, short fontsize, boolean flhavefont, boolean flhavesize, bigstring bs) {
  	
  	bigstring bsint;
  	
! 	setstringlength(bs,0); /*set it to the empty string%/
  	
  	if (flhavefont)
--- 425,435 ----
  
  
! #if 0
! 
  void fontstring (short fontnum, short fontsize, boolean flhavefont, boolean flhavesize, bigstring bs) {
  	
  	bigstring bsint;
  	
! 	setstringlength(bs,0); /*set it to the empty string*/
  	
  	if (flhavefont)
***************
*** 451,455 ****
  
  
! /*
  void getstyle (style, flplain, flbold, flitalic, flunderline, floutline, flshadow) 
  
--- 452,456 ----
  
  
! 
  void getstyle (style, flplain, flbold, flitalic, flunderline, floutline, flshadow) 
  
***************
*** 460,464 ****
  	if none of the others are true, we set flplain to true.  otherwise 
  	flplain is false.
! 	%/
  
  	short style; 
--- 461,465 ----
  	if none of the others are true, we set flplain to true.  otherwise 
  	flplain is false.
! 	*/
  
  	short style; 
***************
*** 466,470 ****
  	
  	{
! 	*flplain = true;  /*default values%/
  	
  	*flbold = false;
--- 467,471 ----
  	
  	{
! 	*flplain = true;  /*default values*/
  	
  	*flbold = false;
***************
*** 523,527 ****
  		}
  	} /*getstyle*/
!    
  
  void diskgetfontname (short fontnum, diskfontstring fontname) {
--- 524,530 ----
  		}
  	} /*getstyle*/
! 
! #endif
! 
  
  void diskgetfontname (short fontnum, diskfontstring fontname) {
***************
*** 552,556 ****
  	
  		
! boolean initfonts () {
  	
  	#ifdef WIN95VERSION
--- 555,559 ----
  	
  		
! boolean initfonts (void) {
  	
  	#ifdef WIN95VERSION

Index: mouse.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/mouse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mouse.c	23 Oct 2004 22:37:54 -0000	1.2
--- mouse.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 342,364 ****
  	} /*mousedoubleclick*/
  
  boolean ismouseleftclick (void) {
  
  	return (mousestatus.whichbutton == leftmousebuttonaction);
! 	} /*mousedoubleclick*/
  
  boolean ismouserightclick (void) {
  
  	return (mousestatus.whichbutton == rightmousebuttonaction);
! 	} /*mousedoubleclick*/
  
  boolean ismousecenterclick (void) {
  
  	return (mousestatus.whichbutton == centermousebuttonaction);
! 	} /*mousedoubleclick*/
  
  boolean ismousewheelclick (void) {
  
  	return (mousestatus.whichbutton == wheelmousebuttonaction);
! 	} /*mousedoubleclick*/
  
  
--- 342,368 ----
  	} /*mousedoubleclick*/
  
+ 
  boolean ismouseleftclick (void) {
  
  	return (mousestatus.whichbutton == leftmousebuttonaction);
! 	} /*ismouseleftclick*/
! 
  
  boolean ismouserightclick (void) {
  
  	return (mousestatus.whichbutton == rightmousebuttonaction);
! 	} /*ismouserightclick*/
! 
  
  boolean ismousecenterclick (void) {
  
  	return (mousestatus.whichbutton == centermousebuttonaction);
! 	} /*ismousecenterclick*/
! 
  
  boolean ismousewheelclick (void) {
  
  	return (mousestatus.whichbutton == wheelmousebuttonaction);
! 	} /*ismousewheelclick*/
  
  
***************
*** 508,512 ****
  		for (j = 0; j <= 100; j++) {
  			
! 			/*
  			if (optionkeydown ())
  				return;
--- 512,516 ----
  		for (j = 0; j <= 100; j++) {
  			
! 			/%
  			if (optionkeydown ())
  				return;
***************
*** 519,523 ****
  			smashmouse (pt);
  			
! 			/*
  			copystring ("\p(h = ", bs);
  			
--- 523,527 ----
  			smashmouse (pt);
  			
! 			/%
  			copystring ("\p(h = ", bs);
  			
***************
*** 534,538 ****
  			}
  		}
! 	} /*smashmousetester*/
  
  
--- 538,543 ----
  			}
  		}
! 	} /%smashmousetester%/
! */
  
  

Index: launch.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/launch.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** launch.c	26 Oct 2004 21:53:17 -0000	1.4
--- launch.c	31 Oct 2004 13:02:23 -0000	1.5
***************
*** 953,960 ****
  		AECreateList (nil, 0, false, &doclist); /*create list for the fsspec*/
  		
! 		/*
! 		AEPutPtr (&doclist, 0, typeFSS, (Ptr) &fs, sizeof (fs)); /* put filespec on the list%/
! 		*/		
! 		
  		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
  		
--- 953,958 ----
  		AECreateList (nil, 0, false, &doclist); /*create list for the fsspec*/
  		
! 		//AEPutPtr (&doclist, 0, typeFSS, (Ptr) &fs, sizeof (fs)); /* put filespec on the list%/
! 				
  		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
  		
***************
*** 987,991 ****
  	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
  		
! 		copydatahandle (&launchdesc, appparams);
  
  	#else
--- 985,989 ----
  	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
  		
! 		copydatahandle (&launchdesc, (Handle*) appparams);
  
  	#else
***************
*** 1070,1076 ****
  			if (!fileexists (fsapp, &flfolder)) {
  			
! 				(*fsapp).name [0] = lenname; /*pop off the .app suffix+/
! 				} /*if+/
! 			} /*if+/
  		}
  		*/
--- 1068,1074 ----
  			if (!fileexists (fsapp, &flfolder)) {
  			
! 				(*fsapp).name [0] = lenname; /%pop off the .app suffix%/
! 				} /%if%/
! 			} /%if%/
  		}
  		*/

Index: scripts.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/scripts.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** scripts.c	23 Oct 2004 22:50:50 -0000	1.2
--- scripts.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 136,148 ****
  	hdlhashnode localtablestack [maxchainedlocals]; /*nodes of tables in the runtimestack*/
  	
! 	/***Handle localtableformatsstack [maxchainedlocals]; /*nodes of tables in the runtimestack*/
  	
  	short toplocaltable; /*table stack pointer*/
  	
! 	/*
! 	short deferredbuttonnum; /*see scriptdeferbutton%/
  	
! 	WindowPtr deferredwindow; /*ditto%/
! 	*/
  	
  	hdlheadrecord hbarcursor; /*the headline we've most recently shown*/
--- 136,146 ----
  	hdlhashnode localtablestack [maxchainedlocals]; /*nodes of tables in the runtimestack*/
  	
! 	//Handle localtableformatsstack [maxchainedlocals]; /*nodes of tables in the runtimestack*/
  	
  	short toplocaltable; /*table stack pointer*/
  	
! 	//short deferredbuttonnum; /*see scriptdeferbutton*/
  	
! 	//WindowPtr deferredwindow; /*ditto*/
  	
  	hdlheadrecord hbarcursor; /*the headline we've most recently shown*/
***************
*** 184,190 ****
  static hdldebuggerrecord debuggerdata = nil;
  
! static boolean flenablemenus = false;
  
! static short scriptbackgrounddisable = 0; /*it's possible to temporarily disable backgrounding*/
  
  //static long scriptbackgroundtime = 0;
--- 182,188 ----
  static hdldebuggerrecord debuggerdata = nil;
  
! //static boolean flenablemenus = false;
  
! //static short scriptbackgrounddisable = 0; /*it's possible to temporarily disable backgrounding*/
  
  //static long scriptbackgroundtime = 0;
***************
*** 209,213 ****
  	
  	++scriptbackgrounddisable;
! 	} /*disablescriptbackground%/
  
  
--- 207,211 ----
  	
  	++scriptbackgrounddisable;
! 	} /%disablescriptbackground%/
  
  
***************
*** 215,219 ****
  	
  	--scriptbackgrounddisable;
! 	} /*enablescriptbackground%/
  */
  
--- 213,217 ----
  	
  	--scriptbackgrounddisable;
! 	} /%enablescriptbackground%/
  */
  
***************
*** 232,237 ****
  	
  	scriptbackgroundtime = gettickcount ();
! 	} /*scriptresetbackgroundtime*/
! 
  
  static boolean isheadrecordhandle (long refcon) {
--- 230,235 ----
  	
  	scriptbackgroundtime = gettickcount ();
! 	} /%scriptresetbackgroundtime%/
! */
  
  static boolean isheadrecordhandle (long refcon) {
***************
*** 494,500 ****
  	
  	/*
! 	if (hashnodeintable (hnode, agentstable)) { /*special stuff for agents%/
  		
! 		if (!processreplacecode (holdcode, hnewcode)) { /*no replacement, add new process%/
  			
  			langdisposetree (holdcode);
--- 492,498 ----
  	
  	/*
! 	if (hashnodeintable (hnode, agentstable)) { /%special stuff for agents%/
  		
! 		if (!processreplacecode (holdcode, hnewcode)) { /%no replacement, add new process%/
  			
  			langdisposetree (holdcode);
***************
*** 1162,1166 ****
  	bigstring bstrap;
  	boolean fl;
! 	boolean scriptdebuggereventloop (void); //forward
  	hdlhashnode hhashnode;
  	#define str_userdebugprefs ("\x10" "user.prefs.debug")
--- 1160,1164 ----
  	bigstring bstrap;
  	boolean fl;
! 	static boolean scriptdebuggereventloop (void); //forward
  	hdlhashnode hhashnode;
  	#define str_userdebugprefs ("\x10" "user.prefs.debug")
***************
*** 1444,1448 ****
  #ifdef flcomponent
  
! static pascal OSErr handlerecordedtext (AppleEvent *event, AppleEvent *reply, long refcon) {
  	
  	/*
--- 1442,1446 ----
  #ifdef flcomponent
  
! static pascal OSErr handlerecordedtext (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) {
  	
  	/*
***************
*** 1684,1688 ****
  
  
! static pascal OSErr handlestoprecording (AppleEvent *event, AppleEvent *reply, long refcon) {
  	
  	/*
--- 1682,1686 ----
  
  
! static pascal OSErr handlestoprecording (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) {
  	
  	/*
***************
*** 1872,1876 ****
  	
  	/*
! 	if (!processyieldtoagents ()) /*file closed while agents were finishing up%/
  		return (false);
  	*/
--- 1870,1874 ----
  	
  	/*
! 	if (!processyieldtoagents ()) /%file closed while agents were finishing up%/
  		return (false);
  	*/
***************
*** 1918,1922 ****
  	
  	/*
! 	if ((**hd).flscriptsuspended && !debuggingcurrentprocess ()) { /*defer background hits%/
  		
  		if (buttonnum != installbutton) {
--- 1916,1920 ----
  	
  	/*
! 	if ((**hd).flscriptsuspended && !debuggingcurrentprocess ()) { /%defer background hits%/
  		
  		if (buttonnum != installbutton) {
***************
*** 2102,2106 ****
  	else {
  		
! 		if ((x != runbutton) && (x != debugbutton) && (x != installbutton)) /*rule 1%/
  			return (false);
  		}
--- 2100,2104 ----
  	else {
  		
! 		if ((x != runbutton) && (x != debugbutton) && (x != installbutton)) /%rule 1%/
  			return (false);
  		}
***************
*** 2252,2256 ****
  
  
! /*
  boolean scriptkilled (void) {
  	
--- 2250,2255 ----
  
  
! #if 0
! 
  boolean scriptkilled (void) {
  	
***************
*** 2262,2266 ****
  	it's handled by returning false from the debugger routine.  checking 
  	it here will wrongly terminate some other process
! 	%/
  	
  	register hdldebuggerrecord hd = debuggerdata;
--- 2261,2265 ----
  	it's handled by returning false from the debugger routine.  checking 
  	it here will wrongly terminate some other process
! 	*/
  	
  	register hdldebuggerrecord hd = debuggerdata;
***************
*** 2269,2275 ****
  	if ((**hd).flscriptkilled) {
  		
! 		if (processisoneshot (false)) { /*we're running a one-shot process%/
  			
! 			(**hd).flscriptkilled = false; /*consume it%/
  			
  			scriptprocesskilled ();
--- 2268,2274 ----
  	if ((**hd).flscriptkilled) {
  		
! 		if (processisoneshot (false)) { /%we're running a one-shot process%/
  			
! 			(**hd).flscriptkilled = false; /%consume it%/
  			
  			scriptprocesskilled ();
***************
*** 2278,2288 ****
  			}
  		}
! 	%/
  	
! 	if (keyboardescape ()) { /*user pressed cmd-period or something like that%/
  		
! 		if (processisoneshot (true)) { /*cmd-period doesn't kill background tasks%/
  			
! 			keyboardclearescape (); /*consume it%/
  			
  			return (true);
--- 2277,2287 ----
  			}
  		}
! 	*/
  	
! 	if (keyboardescape ()) { /*user pressed cmd-period or something like that*/
  		
! 		if (processisoneshot (true)) { /*cmd-period doesn't kill background tasks*/
  			
! 			keyboardclearescape (); /*consume it*/
  			
  			return (true);
***************
*** 2293,2296 ****
--- 2292,2297 ----
  	} /*scriptkilled*/
  
+ #endif
+ 
  
  static boolean scriptdebuggercallback (void) {
***************
*** 2307,2311 ****
  	
  	/*
! 	if ((**hd).deferredbuttonnum > 0) /*a script button hit was deferred%/
  		return (false);
  	*/
--- 2308,2312 ----
  	
  	/*
! 	if ((**hd).deferredbuttonnum > 0) /%a script button hit was deferred%/
  		return (false);
  	*/
***************
*** 2341,2345 ****
  		
  		/*
! 		if ((**hd).deferredbuttonnum > 0) { /*a background button click was deferred%/
  			
  			shellpushglobals ((**hd).deferredwindow);
--- 2342,2346 ----
  		
  		/*
! 		if ((**hd).deferredbuttonnum > 0) { /%a background button click was deferred%/
  			
  			shellpushglobals ((**hd).deferredwindow);
***************
*** 2349,2353 ****
  			shellpopglobals ();
  			
! 			(**hd).deferredbuttonnum = 0; /*consume it%/
  			}
  		*/
--- 2350,2354 ----
  			shellpopglobals ();
  			
! 			(**hd).deferredbuttonnum = 0; /%consume it%/
  			}
  		*/
***************
*** 2423,2427 ****
  	short diff;
  	
! 	/*shellshorteventloop (); /*suck up and process any waiting events*/
  	
  	if (languserescaped (true)) /*stop running the script immediately*/
--- 2424,2428 ----
  	short diff;
  	
! 	//shellshorteventloop (); /*suck up and process any waiting events*/
  	
  	if (languserescaped (true)) /*stop running the script immediately*/
***************
*** 2472,2476 ****
  		
  		switch ((**hd).stepdir) {
! 			
  			case down:
  				if (diff == 0)
--- 2473,2477 ----
  		
  		switch ((**hd).stepdir) {
! 				
  			case down:
  				if (diff == 0)
***************
*** 2478,2497 ****
  				else
  					flshowline = diff < 0;
- 				
  				break;
  			
  			case right:
  				flshowline = diff != 0; /*if less then zero, In step fails and stops*/
- 				
  				break;
  			
  			case left:
  				flshowline = diff < 0;
- 				
  				break;
  			
  			case nodirection: /*following*/
  				flshowline = false;
! 				
  				break;
  			}
--- 2479,2498 ----
  				else
  					flshowline = diff < 0;
  				break;
  			
  			case right:
  				flshowline = diff != 0; /*if less then zero, In step fails and stops*/
  				break;
  			
  			case left:
  				flshowline = diff < 0;
  				break;
  			
  			case nodirection: /*following*/
  				flshowline = false;
! 				break;
! 			
! 			default:
! 				/* do nothing for up, flatup, flatdown, sorted, pageup, pagedown, pageleft, pageright */
  				break;
  			}
***************
*** 2916,2925 ****
  
  
! /*
  static boolean scripthaslinkedtextroutine (hdlheadrecord hnode) {
  	
! 	return (false); /*no linked text for script lines%/
  	} /*scripthaslinkedtextroutine*/
  
  
  static boolean optogglebreakpoint (hdlheadrecord hnode) {
--- 2917,2929 ----
  
  
! #if 0
! 
  static boolean scripthaslinkedtextroutine (hdlheadrecord hnode) {
  	
! 	return (false); /*no linked text for script lines*/
  	} /*scripthaslinkedtextroutine*/
  
+ #endif
+ 
  
  static boolean optogglebreakpoint (hdlheadrecord hnode) {
***************
*** 3054,3058 ****
  static boolean scriptsetscraproutine (hdloutlinerecord houtline) {
  	
! 	return (shellsetscrap ((Handle) houtline, scriptscraptype, &scriptdisposescrap, &scriptexportscrap));
  	} /*scriptsetscraproutine*/
  
--- 3058,3064 ----
  static boolean scriptsetscraproutine (hdloutlinerecord houtline) {
  	
! 	return (shellsetscrap ((Handle) houtline, scriptscraptype, 
! 				(shelldisposescrapcallback) &scriptdisposescrap,
! 				(shellexportscrapcallback) &scriptexportscrap));
  	} /*scriptsetscraproutine*/
  
***************
*** 3164,3172 ****
  	(**ho).doubleclickcallback = &scriptdoubleclick;
  	
! 	(**ho).setscrapcallback = &scriptsetscraproutine;
  	
! 	(**ho).getscrapcallback = &scriptgetscraproutine;
  	
! 	(**ho).texttooutlinecallback = &scripttexttooutlineroutine;
  
  	} /*scriptsetcallbacks*/
--- 3170,3178 ----
  	(**ho).doubleclickcallback = &scriptdoubleclick;
  	
! 	(**ho).setscrapcallback = (opsetscrapcallback) &scriptsetscraproutine;
  	
! 	(**ho).getscrapcallback = (opgetscrapcallback) &scriptgetscraproutine;
  	
! 	(**ho).texttooutlinecallback = (optexttooutlinecallback) &scripttexttooutlineroutine;
  
  	} /*scriptsetcallbacks*/
***************
*** 3182,3187 ****
  	
  	register hdloutlinerecord ho = houtline;
- 	WindowPtr origoutlinewindow = outlinewindow;
- 	hdlwindowinfo origoutlinewindowinfo = outlinewindowinfo;
  	hdlwindowinfo hinfo;
  	bigstring bs;
--- 3188,3191 ----
***************
*** 3317,3321 ****
  	
  	/*
! 	if (!processyieldtoagents ()) /*file closed while agents were finishing up%/
  		return (false);
  	*/
--- 3321,3325 ----
  	
  	/*
! 	if (!processyieldtoagents ()) /%file closed while agents were finishing up%/
  		return (false);
  	*/
***************
*** 3750,3754 ****
  	
  	#if flstacktrace
! 	/*** hs = langcallbacks.scripterrorstack; /*langerrorgetstack ();*/
  	
  	if (scriptinruntimestack () /*hs != nil*/ ) /*popup is stack, not language*/
--- 3754,3758 ----
  	
  	#if flstacktrace
! 	//hs = langcallbacks.scripterrorstack; /*langerrorgetstack ();*/
  	
  	if (scriptinruntimestack () /*hs != nil*/ ) /*popup is stack, not language*/
***************
*** 4104,4107 ****
--- 4108,4113 ----
  
  
+ #if 0
+ 
  static boolean opwinnewrecord (void) {
  	
***************
*** 4199,4202 ****
--- 4205,4210 ----
  	} /*opwinsavefile*/
  
+ #endif
+ 
  
  boolean scriptstart (void) {
***************
*** 4318,4322 ****
  	(*cb).gettargetdataroutine = &scriptgettargetdata;
  	
! 	(*cb).getvariableroutine = &scriptgetvariable;
  	
  	(*cb).settextmoderoutine = &opsettextmode;
--- 4326,4330 ----
  	(*cb).gettargetdataroutine = &scriptgettargetdata;
  	
! 	(*cb).getvariableroutine = (shellgetvariablecallback) &scriptgetvariable;
  	
  	(*cb).settextmoderoutine = &opsettextmode;

Index: services.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/services.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** services.c	23 Oct 2004 22:51:48 -0000	1.2
--- services.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 193,197 ****
  pascal OSStatus serviceshandlergettypes (EventHandlerCallRef nextHandler, EventRef inEvent, void* userData) {
  	
- 	boolean fltextselection = true;
  	CFMutableArrayRef copytypes, pastetypes;
  	short ix, count;
--- 193,196 ----

Index: about.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/about.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** about.c	24 Oct 2004 18:00:04 -0000	1.3
--- about.c	31 Oct 2004 13:02:23 -0000	1.4
***************
*** 459,462 ****
--- 459,464 ----
  
  
+ #if 0
+ 
  static boolean ccfindagentvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) {
  	
***************
*** 472,475 ****
--- 474,479 ----
  	} /*ccfindagentvisit*/
  
+ #endif
+ 
  
  static void ccdrawagentpopup (void) {
***************
*** 507,510 ****
--- 511,516 ----
  
  
+ #if 0
+ 
  static void cceraseagentpopup (void) {
  	
***************
*** 515,518 ****
--- 521,526 ----
  	} /*cceraseagentpopup*/
  
+ #endif
+ 
  
  static void ccgetmsgrect (Rect *rmsg) {
***************
*** 555,559 ****
  	
  	register hdlcancoonrecord hc = cancoonglobals;
! 	register hdlwindowinfo hw = aboutwindowinfo;
  	register hdlstring hstring;
  	register boolean flbitmap = false;
--- 563,567 ----
  	
  	register hdlcancoonrecord hc = cancoonglobals;
! 	//register hdlwindowinfo hw = aboutwindowinfo;
  	register hdlstring hstring;
  	register boolean flbitmap = false;
***************
*** 582,586 ****
  	
  	/*
! 	if (hstring == nil) /*no primary message, display file name%/
  		hstring = (**hw).hfilename;
  	*/
--- 590,594 ----
  	
  	/*
! 	if (hstring == nil) /%no primary message, display file name%/
  		hstring = (**hw).hfilename;
  	*/
***************
*** 896,900 ****
  		CGrafPtr	thePort;
  		#if TARGET_API_MAC_CARBON == 1
! 		thePort = GetWindowPort(aboutport);
  		#else
  		thePort = (CGrafPtr)aboutport;		
--- 904,908 ----
  		CGrafPtr	thePort;
  		#if TARGET_API_MAC_CARBON == 1
! 		thePort = GetWindowPort((WindowRef) aboutport);
  		#else
  		thePort = (CGrafPtr)aboutport;		
***************
*** 1216,1220 ****
  	
  
- 	hdlcancoonrecord hc = cancoonglobals;
  	hdlaboutrecord ha = aboutdata;
  	register hdlwindowinfo hw = hinfo;
--- 1224,1227 ----
***************
*** 1351,1354 ****
--- 1358,1363 ----
  
  
+ #ifndef version42orgreater
+ 
  static void drawtextitem (WindowPtr w, short item, short font, short size, short style) {
  	
***************
*** 1356,1362 ****
  	bigstring bsitem;
  	
! 	getdialogtext (w, item, bsitem);
  	
! 	dialoggetobjectrect (w, item, &ritem);
  	
  	edittextbox (bsitem, ritem, font, size, style);
--- 1365,1371 ----
  	bigstring bsitem;
  	
! 	getdialogtext ((DialogPtr) w, item, bsitem);
  	
! 	dialoggetobjectrect ((DialogPtr) w, item, &ritem);
  	
  	edittextbox (bsitem, ritem, font, size, style);
***************
*** 1369,1373 ****
  	bigstring bsscript;
  	//this is a problem. aboutwindow is a window
! 	getdialogtext (aboutwindow, urlitem, bsurl);
  	
  	if (!getsystemtablescript (idopenurlscript, bsscript))
--- 1378,1382 ----
  	bigstring bsscript;
  	//this is a problem. aboutwindow is a window
! 	getdialogtext ((DialogPtr) aboutwindow, urlitem, bsurl);
  	
  	if (!getsystemtablescript (idopenurlscript, bsscript))
***************
*** 1397,1402 ****
  
  
- #ifndef version42orgreater
- 
  #define aboutresnumber 128 /*the id of the various "about" resources*/
  
--- 1406,1409 ----

Index: frontierdebug.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/frontierdebug.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** frontierdebug.c	23 Oct 2004 22:20:26 -0000	1.2
--- frontierdebug.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 187,191 ****
  
  	#ifdef MACVERSION
! 		fprintf (logfile, "%08X (%04ld) | %04X | %s | %s\n", (unsigned long) ticks, (ticks - lastticks), idthread, category, str);
  	#endif
  
--- 187,191 ----
  
  	#ifdef MACVERSION
! 		fprintf (logfile, "%08lX (%04ld) | %08lX | %s | %s\n", (unsigned long) ticks, (ticks - lastticks), idthread, category, str);
  	#endif
  

Index: menu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menu.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** menu.c	23 Oct 2004 22:35:49 -0000	1.2
--- menu.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 1576,1582 ****
  	register hdlmenu h;
  	
! 	h = NewMenu (idtempmenu, (ptrstring) "\p¹"); /*name is irrelevent in a popup%/
  	
! 	if (h == nil) { /*error allocating new menu%/
  		
  		sysbeep ();
--- 1576,1582 ----
  	register hdlmenu h;
  	
! 	h = NewMenu (idtempmenu, (ptrstring) "\p¹"); /%name is irrelevent in a popup%/
  	
! 	if (h == nil) { /%error allocating new menu%/
  		
  		sysbeep ();
***************
*** 1590,1594 ****
  	
  	return (true);
! 	} /*newtempmenu*/
  	
  	
--- 1590,1595 ----
  	
  	return (true);
! 	} /%newtempmenu%/
! */
  	
  	

Index: icon.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/icon.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** icon.c	23 Oct 2004 22:22:21 -0000	1.2
--- icon.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 195,199 ****
  static short ixnexticon = 0; /*keep track of which is next to load*/
  
- customiconload (bigstring bsiconname, short *resid);
  
  boolean customicongetrnum (bigstring bstype, short *rnum) {
--- 195,198 ----
***************
*** 227,231 ****
  
  
! customiconload (bigstring bsiconname, short *rnum) {
  	
  	/*
--- 226,230 ----
  
  
! static boolean customiconload (bigstring bsiconname, short *rnum) {
  	
  	/*
***************
*** 234,241 ****
  	*/
  	
- 	short customresid = 128; /*always 128 in the icon files*/
  	bigstring bsappearancefolder = "\pAppearance";
  	bigstring bsiconsfolder = "\pIcons";
- 	boolean flcreate = false;
  	OSErr err;
  	CInfoPBRec pb;
--- 233,238 ----
***************
*** 436,442 ****
  
  
  /*7.0b9 PBS: saved version that had test code for getting a bitmap from the odb.*/
  
! /*boolean ploticoncustom (const Rect *r, short align, short transform) {
  	
  	/*
--- 433,441 ----
  
  
+ #if 0
+ 
  /*7.0b9 PBS: saved version that had test code for getting a bitmap from the odb.*/
  
! boolean ploticoncustom (const Rect *r, short align, short transform) {
  	
  	/*
***************
*** 445,449 ****
  	
  
! /*#ifdef WIN95VERSION
  	HBITMAP hbm, oldbm;
  	BITMAP bm;
--- 444,448 ----
  	
  
! #ifdef WIN95VERSION
  	HBITMAP hbm, oldbm;
  	BITMAP bm;
***************
*** 554,557 ****
--- 553,558 ----
  	} /*ploticoncustom*/
  
+ #endif
+ 
  
  boolean ploticon (const Rect *r, short id) {
***************
*** 660,664 ****
  		delayticks (1);
  		}
! 	} /*drawiconsequence*/
  
  
--- 661,666 ----
  		delayticks (1);
  		}
! 	} /%drawiconsequence%/
! */
  
  
***************
*** 666,670 ****
  
  	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
! 		bigstring bs, SInt16 depth, Boolean isColorDev) {
  		
  		/*
--- 668,672 ----
  
  	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
! 		UInt32 refcon, SInt16 depth, Boolean isColorDev) {
  		
  		/*
***************
*** 673,676 ****
--- 675,679 ----
  		
  		Rect rarrow;
+ 		//ptrstring bsptr = (ptrstring) refcon;
  		
  		setrect (&rarrow, 0, 0, 9, 9);

Index: memory.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/memory.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** memory.c	23 Oct 2004 22:35:22 -0000	1.2
--- memory.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 228,232 ****
  
  
! /*
  heapmess (void) {
  	
--- 228,233 ----
  
  
! #if 0
! 
  heapmess (void) {
  	
***************
*** 244,248 ****
  		
  		ray [ixray++] = h;
! 		} /*while%/
  	
  	for (i = 0; i < ixray; i++)
--- 245,249 ----
  		
  		ray [ixray++] = h;
! 		} /*while*/
  	
  	for (i = 0; i < ixray; i++)
***************
*** 250,259 ****
  	} /*heapmess*/
  
! /*
  boolean analyzeheap (void) {
  	
  	/*
  	get some statistics about the heap.  doesn't work in 32-bit mode.
! 	%/
  	
  	register byte *pblock;
--- 251,260 ----
  	} /*heapmess*/
  
! 
  boolean analyzeheap (void) {
  	
  	/*
  	get some statistics about the heap.  doesn't work in 32-bit mode.
! 	*/
  	
  	register byte *pblock;
***************
*** 264,268 ****
  	static long avghandlesize;
  	
! 	pblock = (byte *) &(*TheZone).heapData; /*point for first block in heap zone%/
  	
  	plimit = (byte *) (*TheZone).bkLim;
--- 265,269 ----
  	static long avghandlesize;
  	
! 	pblock = (byte *) &(*TheZone).heapData; /*point for first block in heap zone*/
  	
  	plimit = (byte *) (*TheZone).bkLim;
***************
*** 270,274 ****
  	cthandles = 0;
  	
! 	ctbytes = 0; /*logical size of each handle%/
  	
  	while (pblock < plimit) {
--- 271,275 ----
  	cthandles = 0;
  	
! 	ctbytes = 0; /*logical size of each handle*/
  	
  	while (pblock < plimit) {
***************
*** 276,284 ****
  		size = *(long *)pblock & 0x00ffffff;
  		
! 		if (*pblock & 0x80) { /*a relocateable block%/
  			
! 			ctbytes += size; /*add physical size%/
  			
! 			/*ctbytes -= 8 + (*pblock & 0x0f); /*subtract header & size correction%/
  			
  			++cthandles;
--- 277,285 ----
  		size = *(long *)pblock & 0x00ffffff;
  		
! 		if (*pblock & 0x80) { /*a relocateable block*/
  			
! 			ctbytes += size; /*add physical size*/
  			
! 			//ctbytes -= 8 + (*pblock & 0x0f); /*subtract header & size correction*/
  			
  			++cthandles;
***************
*** 291,294 ****
--- 292,297 ----
  	} /*analyzeheap*/
  
+ #endif
+ 
  
  boolean haveheapspace (long size) {
***************
*** 557,563 ****
  	if (ctloops > 0) {
  	
! 		ps = (ptrbyte) psource + length - 1; /*right edge of source+/
  	
! 		pd = (ptrbyte) pdest + length - 1; /*right edge of destination+/
  	
  		while (ctloops--) 
--- 560,566 ----
  	if (ctloops > 0) {
  	
! 		ps = (ptrbyte) psource + length - 1; /%right edge of source%/
  	
! 		pd = (ptrbyte) pdest + length - 1; /%right edge of destination%/
  	
  		while (ctloops--) 
***************
*** 854,861 ****
  	register long ctorig = gethandlesize (h);
  	
! 	if (h == nil) /*defensive driving%/
  		return (false);
  	
! 	ctgrab >>= 1; /*cut in half%/
  	
  	if (ctgrab > ctorig) {
--- 857,864 ----
  	register long ctorig = gethandlesize (h);
  	
! 	if (h == nil) /%defensive driving%/
  		return (false);
  	
! 	ctgrab >>= 1; /%cut in half%/
  	
  	if (ctgrab > ctorig) {
***************
*** 1187,1191 ****
  	*/
  	
- 	Handle h = hgrow;
  	unsigned long origsize;
  	
--- 1190,1193 ----
***************
*** 1360,1364 ****
  
  
! /*
  boolean pushindentedline (short level, bigstring bs, Handle htext) {
  	
--- 1362,1367 ----
  
  
! #if 0
! 
  boolean pushindentedline (short level, bigstring bs, Handle htext) {
  	
***************
*** 1368,1382 ****
  	
  	return false if it failed, we dispose of htext if it failed.
! 	%/
  	
  	bigstring bsoutput;
  	
! 	filledstring (chtab, level, bsoutput); /*put out leading tabs%/
  	
! 	pushstring (bs, bsoutput); /*put out the string itself%/
  	
! 	pushchar (chreturn, bsoutput); /*put out a terminating carriage return character%/
  	
! 	if (!pushtexthandle (bsoutput, htext)) { /*out of memory%/
  	
  		disposehandle (htext);
--- 1371,1385 ----
  	
  	return false if it failed, we dispose of htext if it failed.
! 	*/
  	
  	bigstring bsoutput;
  	
! 	filledstring (chtab, level, bsoutput); /*put out leading tabs*/
  	
! 	pushstring (bs, bsoutput); /*put out the string itself*/
  	
! 	pushchar (chreturn, bsoutput); /*put out a terminating carriage return character*/
  	
! 	if (!pushtexthandle (bsoutput, htext)) { /*out of memory*/
  	
  		disposehandle (htext);
***************
*** 1387,1390 ****
--- 1390,1395 ----
  	return (true);
  	} /*pushindentedline*/
+ 
+ #endif
  	   
  
***************
*** 1417,1423 ****
  
  /*
! boolean concatheapstrings (h1, h2, hreturned) hdlstring *h1, *h2, *hreturned; {
  
! 	/*
  	given two heap strings, return a heap string that's the result of 
  	concatenating the two strings.
--- 1422,1428 ----
  
  /*
! boolean concatheapstrings (hdlstring *h1, hdlstring *h2, hdlstring *hreturned) {
  
! 	/%
  	given two heap strings, return a heap string that's the result of 
  	concatenating the two strings.
***************
*** 1453,1457 ****
  		
  	return (newheapstring (bs, hreturned));
! 	} /*concatheapstrings%/
  */
  
--- 1458,1462 ----
  		
  	return (newheapstring (bs, hreturned));
! 	} /%concatheapstrings%/
  */
  

Index: main.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.c	23 Oct 2004 22:34:57 -0000	1.2
--- main.c	31 Oct 2004 13:02:23 -0000	1.3
***************
*** 32,41 ****
  #include "frontierstart.h"
  
! void main (void) {
  	
  	boolean fl;
  	
  	if (!shellinit ())
! 		return;
  	
  	grabthreadglobals ();
--- 32,41 ----
  #include "frontierstart.h"
  
! int main (void) {
  	
  	boolean fl;
  	
  	if (!shellinit ())
! 		return (1);
  	
  	grabthreadglobals ();
***************
*** 47,50 ****
--- 47,52 ----
  	if (fl)
  		shellmaineventloop ();
+ 	
+ 	return (0);
  	} /*mainstart*/