[frontierkernel-commits] Frontier/Common/source shell.c,1.3,1.4 opops.c,1.3,1.4 menubar.c,1.2,1.3 meprograms.c,1.2,1.3 shellbuttons.c,1.3,1.4 shellwindow.c,1.2,1.3 langerror.c,1.2,1.3 osadroplet.c,1.3,1.4 menupack.c,1.2,1.3 langcard.c,1.2,1.3 opdisplay.c,1.4,1.5 menuverbs.c,1.2,1.3 oppack.c,1.2,1.3 langdialog.c,1.2,1.3 opscrollbar.c,1.2,1.3 shellmouse.c,1.2,1.3 langmodeless.c,1.2,1.3 oplist.c,1.3,1.4 op.c,1.3,1.4 langparser.y,1.1,1.2 shellmenu.c,1.2,1.3 oplangtext.c,1.2,1.3 opdraggingmove.c,1.2,1.3 opinit.c,1.2,1.3 shellfile.c,1.2,1.3 langipc.c,1.4,1.5 shellops.c,1.2,1.3 shellkb.c,1.2,1.3 ophoist.c,1.2,1.3 shellupdate.c,1.2,1.3 opedit.c,1.2,1.3 langparser.c,1.2,1.3 shellcallbacks.c,1.2,1.3 shellscrap.c,1.2,1.3 shellscroll.c,1.2,1.3 assert.c,1.4,1.5 shellundo.c,1.2,1.3 oppopup.c,1.2,1.3 langerrorwindow.c,1.2,1.3 menueditor.c,1.2,1.3 lang.c,1.2,1.3 opstructure.c,1.2,1.3 langhash.c,1.3,1.4 opprint.c,1.2,1.3 shellprint.c,1.2,1.3 langlist.c,1.4,1.5

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

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

Modified Files:
	shell.c opops.c menubar.c meprograms.c shellbuttons.c 
	shellwindow.c langerror.c osadroplet.c menupack.c langcard.c 
	opdisplay.c menuverbs.c oppack.c langdialog.c opscrollbar.c 
	shellmouse.c langmodeless.c oplist.c op.c langparser.y 
	shellmenu.c oplangtext.c opdraggingmove.c opinit.c shellfile.c 
	langipc.c shellops.c shellkb.c ophoist.c shellupdate.c 
	opedit.c langparser.c shellcallbacks.c shellscrap.c 
	shellscroll.c assert.c shellundo.c oppopup.c langerrorwindow.c 
	menueditor.c lang.c opstructure.c langhash.c opprint.c 
	shellprint.c langlist.c 
Log Message:
Fixed GCC compiler warnings.

Index: shellcallbacks.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellcallbacks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shellcallbacks.c	23 Oct 2004 22:52:59 -0000	1.2
--- shellcallbacks.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 210,213 ****
--- 210,215 ----
  
  
+ #if 0
+ 
  static boolean shelldefaultstyleroutine (void) {
  	
***************
*** 230,233 ****
--- 232,237 ----
  	} /*shelldefaultstyleroutine*/
  
+ #endif
+ 
  
  boolean shelldefaultselectioninfo (void) {
***************
*** 585,589 ****
  	WindowPtr w;
  	
! 	if (!frontrootwindow (&hinfo)) /*no windows open%/
  		return;
  	
--- 589,593 ----
  	WindowPtr w;
  	
! 	if (!frontrootwindow (&hinfo)) /%no windows open%/
  		return;
  	
***************
*** 613,618 ****
  	
  	popport ();
! 	} /*stacktracer*/
! 	
  	
  boolean shellpushglobals (WindowPtr wpush) {
--- 617,622 ----
  	
  	popport ();
! 	} /%stacktracer%/
! */
  	
  boolean shellpushglobals (WindowPtr wpush) {
***************
*** 638,642 ****
  	
  	/*
! 	if (wpush == nil) /*caller just wants state saved%/ {
  		
  		shellwindow = nil;
--- 642,646 ----
  	
  	/*
! 	if (wpush == nil) /%caller just wants state saved%/ {
  		
  		shellwindow = nil;
***************
*** 711,718 ****
  void shellinvalidglobals (WindowPtr winvalid) {
  	
! 	/*
  	the indicated windowptr is no longer valid -- it was presumably 
  	just disposed.  make sure that we'll never try to push its globals
! 	* /
  	
  	register WindowPtr w = winvalid;
--- 715,722 ----
  void shellinvalidglobals (WindowPtr winvalid) {
  	
! 	/%
  	the indicated windowptr is no longer valid -- it was presumably 
  	just disposed.  make sure that we'll never try to push its globals
! 	%/
  	
  	register WindowPtr w = winvalid;
***************
*** 729,733 ****
  	
  	processinvalidglobals (w); //every thread needs to know about the change*
! 	} /*shellinvalidglobals*/
  
  
--- 733,738 ----
  	
  	processinvalidglobals (w); //every thread needs to know about the change*
! 	} /%shellinvalidglobals%/
! */
  
  

Index: langmodeless.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langmodeless.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langmodeless.c	23 Oct 2004 22:28:25 -0000	1.2
--- langmodeless.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 82,86 ****
  	
  	
! 	return (dialogselectall (langdialogwindow));
  	} /*langdialogselectall*/
  
--- 82,86 ----
  	
  	
! 	return (dialogselectall ((DialogPtr) langdialogwindow));
  	} /*langdialogselectall*/
  
***************
*** 196,200 ****
  		#if TARGET_API_MAC_CARBON
  
! 			while (((char)(*hd) != -1) && ((**hd).flstillalive)) { /*make sure it's handled before window is disposed*/
  				
  				processchecktimeouts ();
--- 196,200 ----
  		#if TARGET_API_MAC_CARBON
  
! 			while (((char)((long)*hd) != -1) && ((**hd).flstillalive)) { /*make sure it's handled before window is disposed*/
  				
  				processchecktimeouts ();
***************
*** 261,267 ****
  
  static boolean langdialogadjustcursor (Point pt){
! 	
! 	register hdldialogrecord hd = langdialogdata;
! 	
  	setcursortype (cursorisarrow);
  	
--- 261,265 ----
  
  static boolean langdialogadjustcursor (Point pt){
! 		
  	setcursortype (cursorisarrow);
  	
***************
*** 278,298 ****
  	
  	return (true);
! 	} /*langdialogsetfontsize%/
  
  
  static boolean langdialogsetfont (void) {
  	
! 	shelldefaultfontroutine (); /*set windowinfo record defaultfont field%/
  	
  	return (langdialogsetfontsize ());
! 	} /*langdialogsetfont%/
  	
  
  static boolean langdialogsetsize (void) {
  	
! 	shelldefaultsizeroutine (); /*set windowinfo record defaultfont field%/
  	
  	return (langdialogsetfontsize ());
! 	} /*langdialogsetsize*/
  
  
--- 276,297 ----
  	
  	return (true);
! 	} /%langdialogsetfontsize%/
  
  
  static boolean langdialogsetfont (void) {
  	
! 	shelldefaultfontroutine (); /%set windowinfo record defaultfont field%/
  	
  	return (langdialogsetfontsize ());
! 	} /%langdialogsetfont%/
  	
  
  static boolean langdialogsetsize (void) {
  	
! 	shelldefaultsizeroutine (); /%set windowinfo record defaultfont field%/
  	
  	return (langdialogsetfontsize ());
! 	} /%langdialogsetsize%/
! */
  
  
***************
*** 332,336 ****
  		return (false);
  	
! 	return (shellsetscrap (htext, textscraptype, &disposehandle, nil));
  	} /*langdialogcopy*/
  
--- 331,335 ----
  		return (false);
  	
! 	return (shellsetscrap (htext, textscraptype, (shelldisposescrapcallback) &disposehandle, nil));
  	} /*langdialogcopy*/
  
***************
*** 386,390 ****
  
  
! static callback savedebugger;
  
  
--- 385,389 ----
  
  
! static langtreenodecallback savedebugger;
  
  
***************
*** 419,423 ****
  	*/
  	
- 	register hdldialogrecord hd = langdialogdata;
  	hdltreenode hparam;
  	tyvaluerecord val;
--- 418,421 ----
***************
*** 492,497 ****
  
  
! static boolean finddialogvisit (WindowPtr w, ptrfinddialoginfo findinfo) {
  	
  	hdlwindowinfo hinfo;
  	hdldialogrecord hd;
--- 490,496 ----
  
  
! static boolean finddialogvisit (WindowPtr w, ptrvoid refcon) {
  	
+ 	ptrfinddialoginfo findinfo = (ptrfinddialoginfo) refcon;
  	hdlwindowinfo hinfo;
  	hdldialogrecord hd;
***************
*** 750,754 ****
  			
  				flzoomscript = false; 	/*7.1b37 PBS: wiring off a feature that: 1. no one knows about and 2. crashes anyway.*/
! 										/*Attempting to support this feature also causes crashes.
  										/*That's why it's gone.*/
  			
--- 749,753 ----
  			
  				flzoomscript = false; 	/*7.1b37 PBS: wiring off a feature that: 1. no one knows about and 2. crashes anyway.*/
! 										/*Attempting to support this feature also causes crashes.*/
  										/*That's why it's gone.*/
  			

Index: opprint.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opprint.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** opprint.c	23 Oct 2004 22:43:11 -0000	1.2
--- opprint.c	1 Nov 2004 11:50:17 -0000	1.3
***************
*** 49,54 ****
  		
  		(**ho).linespacing, (**ho).lineindent, info);
! 	} /*opgetprintdisplayinfo*/
! 
  
  static short opgetpagecount (void) {
--- 49,54 ----
  		
  		(**ho).linespacing, (**ho).lineindent, info);
! 	} /%opgetprintdisplayinfo%/
! */
  
  static short opgetpagecount (void) {
***************
*** 167,171 ****
  	hdlheadrecord oldline1;
  	short oldline1linesabove;
! 	typrintinfo *pi = &shellprintinfo;
  	Rect printrect;
  //	Rect oldoutlinerect;
--- 167,171 ----
  	hdlheadrecord oldline1;
  	short oldline1linesabove;
! 	//typrintinfo *pi = &shellprintinfo;
  	Rect printrect;
  //	Rect oldoutlinerect;

Index: shellops.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellops.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shellops.c	23 Oct 2004 22:54:54 -0000	1.2
--- shellops.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 46,51 ****
  	setscrollbarinfo (
  		(**h).horizscrollbar, (**h).horizmin, (**h).horizmax, (**h).horizcurrent);
! 	} /*shellsetscrollbarinfo*/
! 
  
  void shellsetdefaultstyle (hdlwindowinfo hinfo) {
--- 46,51 ----
  	setscrollbarinfo (
  		(**h).horizscrollbar, (**h).horizmin, (**h).horizmax, (**h).horizcurrent);
! 	} /%shellsetscrollbarinfo%/
! */
  
  void shellsetdefaultstyle (hdlwindowinfo hinfo) {

Index: meprograms.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/meprograms.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** meprograms.c	23 Oct 2004 22:37:27 -0000	1.2
--- meprograms.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 53,58 ****
  
  
! static boolean mefindnodevisit (WindowPtr w, tyfindnodeinfo *findinfo) {
  	
  	boolean fl;
  	
--- 53,59 ----
  
  
! static boolean mefindnodevisit (WindowPtr w, ptrvoid refcon) {
  	
+ 	tyfindnodeinfo *findinfo = (tyfindnodeinfo *) refcon;
  	boolean fl;
  	
***************
*** 197,201 ****
  	register boolean fl;
  	boolean fldispose = false;
- 	long ixload = 0;
  	
  	#if !flruntime
--- 198,201 ----

Index: shell.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shell.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shell.c	29 Oct 2004 19:39:12 -0000	1.3
--- shell.c	1 Nov 2004 11:50:16 -0000	1.4
***************
*** 120,126 ****
  static boolean floverridebeachball = false; /*set true when user action occurs*/
  
! static flipcstarted = false;
  
! static flbackgroundtasksdisabled = true; /*will be set to false when initialization is complete*/
  
  static boolean flshelleventposted = false;
--- 120,126 ----
  static boolean floverridebeachball = false; /*set true when user action occurs*/
  
! static boolean flipcstarted = false;
  
! static boolean flbackgroundtasksdisabled = true; /*will be set to false when initialization is complete*/
  
  static boolean flshelleventposted = false;
***************
*** 281,295 ****
  
  
! #ifdef MACVERSION
  static void shellhandlediskinsertion (void) {
  	//Code change by Timothy Paustian Friday, June 16, 2000 2:21:17 PM
  	//Changed to Opaque call for Carbon
  	//The system takes care of bad mounted disks, we don't need to.
- 	#if !TARGET_API_MAC_CARBON
  	Point pt = {0, 0};
  	
  	if (HiWord (shellevent.message) != 0)
  		DIBadMount (pt, shellevent.message);
- 	#endif
  
  	} /*shellhandlediskinsertion*/
--- 281,293 ----
  
  
! #if defined(MACVERSION) && TARGET_API_MAC_OS8
  static void shellhandlediskinsertion (void) {
  	//Code change by Timothy Paustian Friday, June 16, 2000 2:21:17 PM
  	//Changed to Opaque call for Carbon
  	//The system takes care of bad mounted disks, we don't need to.
  	Point pt = {0, 0};
  	
  	if (HiWord (shellevent.message) != 0)
  		DIBadMount (pt, shellevent.message);
  
  	} /*shellhandlediskinsertion*/
***************
*** 387,391 ****
  			//Code change by Timothy Paustian Friday, June 16, 2000 2:22:47 PM
  			//Changed to Opaque call for Carbon
! 			#if !TARGET_API_MAC_CARBON
  			shellhandlediskinsertion ();
  			#endif
--- 385,389 ----
  			//Code change by Timothy Paustian Friday, June 16, 2000 2:22:47 PM
  			//Changed to Opaque call for Carbon
! 			#if TARGET_API_MAC_OS8
  			shellhandlediskinsertion ();
  			#endif
***************
*** 893,897 ****
  	EventRecord ev;
  	
! 	if (shelleventsblocked ()) /*all events are blocked -- don't ask the OS for any%/
  		return (false);
  	
--- 891,895 ----
  	EventRecord ev;
  	
! 	if (shelleventsblocked ()) /%all events are blocked -- don't ask the OS for any%/
  		return (false);
  	
***************
*** 899,903 ****
  		return (true);
  	
! 	return (landeventfilter (&ev)); /*null event consumed by IAC toolkit%/
  	*/
  	
--- 897,901 ----
  		return (true);
  	
! 	return (landeventfilter (&ev)); /%null event consumed by IAC toolkit%/
  	*/
  	
***************
*** 968,976 ****
  	*/
  	
! 	/*
! 	shellpushblock (networkMask, true); /*for network toolkit; block network events%/
! 	*/
! 
! #if defined(MACVERSION) && !TARGET_API_MAC_CARBON
  	UnloadSeg (&initsegment);
  #endif
--- 966,972 ----
  	*/
  	
! 	//shellpushblock (networkMask, true); /*for network toolkit; block network events%/
! 	
! #if defined(MACVERSION) && TARGET_API_MAC_OS8
  	UnloadSeg (&initsegment);
  #endif
***************
*** 1023,1027 ****
  		OSErr err = noErr;
  		
! 		err = GetIndMenuItemWithCommandID (NULL, kHICommandPreferences, 1, &hmenu, &itemIndex);
  	
  		if (err == noErr) {
--- 1019,1023 ----
  		OSErr err = noErr;
  		
! 		err = GetIndMenuItemWithCommandID (NULL, kHICommandPreferences, 1, &hmenu, (MenuItemIndex*) &itemIndex);
  	
  		if (err == noErr) {
***************
*** 1100,1105 ****
  	
  	ChangedResource (h);
! 	} /*shelltrashresource*/
! 
  
  #ifdef MACVERSION
--- 1096,1101 ----
  	
  	ChangedResource (h);
! 	} /%shelltrashresource%/
! */
  
  #ifdef MACVERSION
***************
*** 1108,1117 ****
  	long ctstillneeded = ctbytesneeded;
  	
  	long curA5 = SetUpAppA5 ();
  	
  	shellcallmemoryhooks (&ctstillneeded);
  	
  	RestoreA5 (curA5);
! 	
  	return (ctbytesneeded - ctstillneeded);
  	} /*shellgrowzone*/
--- 1104,1117 ----
  	long ctstillneeded = ctbytesneeded;
  	
+ 	#if TARGET_API_MAC_OS8
  	long curA5 = SetUpAppA5 ();
+ 	#endif
  	
  	shellcallmemoryhooks (&ctstillneeded);
  	
+ 	#if TARGET_API_MAC_OS8
  	RestoreA5 (curA5);
! 	#endif
! 		
  	return (ctbytesneeded - ctstillneeded);
  	} /*shellgrowzone*/
***************
*** 1386,1390 ****
  	} /*shellinit*/
  
! #if TARGET_API_MAC_CARBON == 1
  static pascal void idleTimer (EventLoopTimerRef theTimer, void * userData)
  {
--- 1386,1390 ----
  	} /*shellinit*/
  
! #if 0 //TARGET_API_MAC_CARBON == 1
  static pascal void idleTimer (EventLoopTimerRef theTimer, void * userData)
  {

Index: opedit.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opedit.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** opedit.c	23 Oct 2004 22:39:51 -0000	1.2
--- opedit.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 113,119 ****
  	*/
  	
! 	hdlstring htext = (**hnode).headstring;
! 	
! 	return (wpsettexthandle (htext));
  	} /*opdefaultsetwpedittext*/
  
--- 113,117 ----
  	*/
  	
! 	return (wpsettexthandle ((**hnode).headstring));
  	} /*opdefaultsetwpedittext*/
  
***************
*** 881,885 ****
  boolean opeditclick (Point pt, tyclickflags flags) {
  	
! 	/*opclearallmarks (); /*9/11/91*/
  	
  	opeditsetglobals ();
--- 879,883 ----
  boolean opeditclick (Point pt, tyclickflags flags) {
  	
! 	//opclearallmarks (); /*9/11/91*/
  	
  	opeditsetglobals ();

Index: langlist.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langlist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** langlist.c	29 Oct 2004 23:54:20 -0000	1.4
--- langlist.c	1 Nov 2004 11:50:17 -0000	1.5
***************
*** 900,904 ****
  	hdllistrecord list2;
  	hdllistrecord list3;
! 	long i, n, m, min_mn;
  	Handle hitem, hignore;
  	bigstring key;
--- 900,904 ----
  	hdllistrecord list2;
  	hdllistrecord list3;
! 	long i, n, m;
  	Handle hitem, hignore;
  	bigstring key;

Index: opops.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opops.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** opops.c	31 Oct 2004 19:08:16 -0000	1.3
--- opops.c	1 Nov 2004 11:50:16 -0000	1.4
***************
*** 379,383 ****
  
  
! static boolean opgetnthnodevisit (hdlheadrecord hnode, ptrscanrecord scanrecord) {
  	
  	if ((*scanrecord).lnumcurrent == (*scanrecord).lnumlookfor) { /*we're at the node*/
--- 379,385 ----
  
  
! static boolean opgetnthnodevisit (hdlheadrecord hnode, ptrvoid refcon) {
! 
! 	ptrscanrecord scanrecord = (ptrscanrecord) refcon;
  	
  	if ((*scanrecord).lnumcurrent == (*scanrecord).lnumlookfor) { /*we're at the node*/
***************
*** 1072,1076 ****
  
  
! static boolean opcontainsvisit (hdlheadrecord hnode, ptrscanrecord scanrecord) {
  	
  	if (hnode == (*scanrecord).hnodelookfor) {
--- 1074,1080 ----
  
  
! static boolean opcontainsvisit (hdlheadrecord hnode, ptrvoid refcon) {
! 	
! 	ptrscanrecord scanrecord = (ptrscanrecord) refcon;
  	
  	if (hnode == (*scanrecord).hnodelookfor) {
***************
*** 1202,1206 ****
  		#if !fljustpacking
  		
! 			(*(**outlinedata).releaserefconcallback) (hnode, (boolean) refcon);
  			
  			#endif
--- 1206,1210 ----
  		#if !fljustpacking
  		
! 			(*(**outlinedata).releaserefconcallback) (hnode, (boolean) ((long) refcon));
  			
  			#endif
***************
*** 1221,1225 ****
  void opreleasenode (hdlheadrecord hnode, boolean fldisk) {
  	
! 	opreleasevisit (hnode, (ptrvoid) fldisk);
  	} /*opreleasenode*/
  
--- 1225,1229 ----
  void opreleasenode (hdlheadrecord hnode, boolean fldisk) {
  	
! 	opreleasevisit (hnode, (ptrvoid) ((long) fldisk));
  	} /*opreleasenode*/
  
***************
*** 1470,1474 ****
  	*/
  	
! 	opsiblingvisiter (hnode, true, &opreleasevisit, (ptrvoid) fldisk);
  	} /*opdisposestructure*/
  
--- 1474,1478 ----
  	*/
  	
! 	opsiblingvisiter (hnode, true, &opreleasevisit, (ptrvoid) ((long) fldisk));
  	} /*opdisposestructure*/
  
***************
*** 1566,1572 ****
  	
  
! static boolean opcountvisit (hdlheadrecord hnode, long *count) {
  	
! 	(*count)++; /*the simplest visit routine*/
  	
  	return (true);
--- 1570,1576 ----
  	
  
! static boolean opcountvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
! 	(*(long*)refcon)++; /*the simplest visit routine*/
  	
  	return (true);
***************
*** 1603,1609 ****
  	
  
! static boolean opnotinoutlinevisit (hdlheadrecord hnode, ptrscanrecord scanrecord) {
  	
! 	return (hnode != (*scanrecord).hnodelookfor);
  	} /*opnotinoutlinevisit*/
  
--- 1607,1613 ----
  	
  
! static boolean opnotinoutlinevisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
! 	return (hnode != (*(ptrscanrecord)refcon).hnodelookfor);
  	} /*opnotinoutlinevisit*/
  

Index: shellscrap.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellscrap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shellscrap.c	23 Oct 2004 22:55:38 -0000	1.2
--- shellscrap.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 278,281 ****
--- 278,283 ----
  
  
+ #ifdef WIN95VERSION
+ 
  static boolean cr2crlfhandle (Handle htext) {
  	
***************
*** 301,304 ****
--- 303,308 ----
  	} /*cr2crlfhandle*/
  
+ #endif
+ 
  
  boolean shellexportscrap (tyscraptype scraptype) {

Index: shellprint.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellprint.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shellprint.c	23 Oct 2004 22:55:21 -0000	1.2
--- shellprint.c	1 Nov 2004 11:50:17 -0000	1.3
***************
*** 62,67 ****
  	
  	clearbytes (&shellprintinfo, longsizeof (shellprintinfo));
! 	} /*shelldisposeprintinfo*/
  
  
  static boolean shellcheckprinterror (boolean flopening) {
--- 62,69 ----
  	
  	clearbytes (&shellprintinfo, longsizeof (shellprintinfo));
! 	} /%shelldisposeprintinfo%/
! */
  
+ #if defined(WIN95VERSION) || (defined(MACVERSION) && !TARGET_API_MAC_CARBON)
  
  static boolean shellcheckprinterror (boolean flopening) {
***************
*** 118,121 ****
--- 120,125 ----
  	} /*shellcheckprinterror*/
  
+ #endif
+ 
  
  static void shellcopyprintinfo (void) {
***************
*** 143,149 ****
  			oserror(theErr);
  		
! 		PMGetAdjustedPageRect(shellprintinfo.pageformat, &rpage);
  			
! 		PMGetAdjustedPaperRect(shellprintinfo.pageformat, &rpaper);
  		shellprintinfo.pagerect = rpage;
  		}
--- 147,153 ----
  			oserror(theErr);
  		
! 		PMGetAdjustedPageRect(shellprintinfo.pageformat, (PMRect *)&rpage);
  			
! 		PMGetAdjustedPaperRect(shellprintinfo.pageformat, (PMRect *)&rpaper);
  		shellprintinfo.pagerect = rpage;
  		}
***************
*** 263,267 ****
--- 267,273 ----
  	return (true);
  	
+ #if !defined(MACVERSION) || !TARGET_API_MAC_CARBON
  	error:
+ #endif
  	
  	/*
***************
*** 302,306 ****
  	OSStatus status;
  	//validate the page format record.
! 	status = PMSessionValidatePageFormat(shellprintinfo.printhandle, &(shellprintinfo.pageformat),
  				kPMDontWantBoolean);
  	// Display the Page Setup dialog
--- 308,313 ----
  	OSStatus status;
  	//validate the page format record.
! 	status = PMSessionValidatePageFormat(shellprintinfo.printhandle,
! 				(PMPageFormat) shellprintinfo.pageformat,
  				kPMDontWantBoolean);
  	// Display the Page Setup dialog
***************
*** 308,312 ****
  	{
  		status = PMSessionPageSetupDialog(shellprintinfo.printhandle, 
! 						&(shellprintinfo.pageformat), &fl);
  		if (!fl)
  			status = kPMCancel; // user clicked Cancel button
--- 315,319 ----
  	{
  		status = PMSessionPageSetupDialog(shellprintinfo.printhandle, 
! 						(PMPageFormat) shellprintinfo.pageformat, &fl);
  		if (!fl)
  			status = kPMCancel; // user clicked Cancel button
***************
*** 359,363 ****
  boolean shellsetprintmargins (Rect newmargins) {
  	
! 	/*
  	10/21/91 dmb: we may need this some day [never tested]
  	%/
--- 366,370 ----
  boolean shellsetprintmargins (Rect newmargins) {
  	
! 	/%
  	10/21/91 dmb: we may need this some day [never tested]
  	%/
***************
*** 374,388 ****
  	shellprintinfo.margins = newmargins;
  	
! 	shellcopyprintinfo (); /*copies fields from handle into record%/
  	
! 	shellvisittypedwindows (-1, &shellpagesetupvisit, nil); /*visit all windows%/
  	
  	return (true);
! 	} /*shellsetprintmargins*/
  
- /*
  void printresetrects (hdlwindowinfo hinfo, Rect * r) {
  	
! 	/*
  	(re)initialize all of the rectangles stored in the window's information 
  	record.  start by clearing the buttons rect and setting the content rect 
--- 381,395 ----
  	shellprintinfo.margins = newmargins;
  	
! 	shellcopyprintinfo (); /%copies fields from handle into record%/
  	
! 	shellvisittypedwindows (-1, &shellpagesetupvisit, nil); /%visit all windows%/
  	
  	return (true);
! 	} /%shellsetprintmargins%/
! 
  
  void printresetrects (hdlwindowinfo hinfo, Rect * r) {
  	
! 	/%
  	(re)initialize all of the rectangles stored in the window's information 
  	record.  start by clearing the buttons rect and setting the content rect 
***************
*** 393,397 ****
  		3.  positioning any scrollbars
  		4.  setting up the grow box rect
! 	* /
  	
  	register hdlwindowinfo h = hinfo;
--- 400,404 ----
  		3.  positioning any scrollbars
  		4.  setting up the grow box rect
! 	%/
  	
  	register hdlwindowinfo h = hinfo;
***************
*** 406,413 ****
  	
  	(*shellglobals.resizeroutine) ();
! 	} /*printresetrects*/
  
  
! boolean iscurrentportprintport () {
  	
  	return (isprintingactive () && (currentprintport == getport()));
--- 413,421 ----
  	
  	(*shellglobals.resizeroutine) ();
! 	} /%printresetrects%/
! */
  
  
! boolean iscurrentportprintport (void) {
  	
  	return (isprintingactive () && (currentprintport == getport()));
***************
*** 415,419 ****
  
  
! boolean isprintingactive () {
  	
  	return (currentprintport != NULL);
--- 423,427 ----
  
  
! boolean isprintingactive (void) {
  	
  	return (currentprintport != NULL);
***************
*** 450,454 ****
  			PMPrintSession 	hp = 0;			// JES 9.0.1: initialize to 0 -- printing still doesn't work on OS X, but at least Cmd-P won't crash //
  			PMPageFormat	pageformat;
! 			PMPrintSettings	printsettings;
  			boolean			accepted;
  			//remember that this is a grafport, TPPrPort isn't
--- 458,462 ----
  			PMPrintSession 	hp = 0;			// JES 9.0.1: initialize to 0 -- printing still doesn't work on OS X, but at least Cmd-P won't crash //
  			PMPageFormat	pageformat;
! 			PMPrintSettings	printsettings = nil;
  			boolean			accepted;
  			//remember that this is a grafport, TPPrPort isn't
***************
*** 486,490 ****
  		{
  		//I may need to save back the graf port.
! 		theErr = PMCreateSession(hp);
  		 //This should cover it, but I may need to add a further check.
  		if(theErr != noErr)
--- 494,498 ----
  		{
  		//I may need to save back the graf port.
! 		theErr = PMCreateSession(&hp); // 2004-10-31 aradke: this was just hp instead of &hp -- not sure what's up!?
  		 //This should cover it, but I may need to add a further check.
  		if(theErr != noErr)
***************
*** 528,532 ****
  		if(fldialog) {
  			theErr = PMCreatePrintSettings(&printsettings);
! 			if(theErr != noErr || (pageformat == kPMNoPrintSettings)){
  				PMRelease(hp);
  				PMRelease(pageformat);
--- 536,540 ----
  		if(fldialog) {
  			theErr = PMCreatePrintSettings(&printsettings);
! 			if(theErr != noErr || (printsettings == kPMNoPrintSettings)){
  				PMRelease(hp);
  				PMRelease(pageformat);
***************
*** 539,543 ****
  		else
  		{
! 			theErr = PMSessionValidatePrintSettings(hp, &printsettings,
  									kPMDontWantBoolean);
  		}
--- 547,551 ----
  		else
  		{
! 			theErr = PMSessionValidatePrintSettings(hp, printsettings,
  									kPMDontWantBoolean);
  		}
***************
*** 550,554 ****
  		
  		//set the page range
! 		theErr = PMSetPageRange(hp, minPage, maxPage);
  		if(theErr != noErr){
  			goto exit;
--- 558,562 ----
  		
  		//set the page range
! 		theErr = PMSetPageRange(printsettings, minPage, maxPage);
  		if(theErr != noErr){
  			goto exit;
***************
*** 637,641 ****
  		if(theErr != noErr)
  			goto exit;
! 		theErr = PMSessionGetGraphicsContext(hp, nil, &printport);//the second parameter is currently ignored.
  		shellprintinfo.printport = printport;
  		if(theErr != noErr)
--- 645,649 ----
  		if(theErr != noErr)
  			goto exit;
! 		theErr = PMSessionGetGraphicsContext(hp, nil, (void**)&printport);//the second parameter is currently ignored.
  		shellprintinfo.printport = printport;
  		if(theErr != noErr)
***************
*** 658,662 ****
  		#if TARGET_API_MAC_CARBON == 1
  				
! 			theErr = PMGetFirstPage(hp, &firstPage);
  			if (theErr == noErr){
  				theErr = PMGetLastPage(printsettings, &lastPage);
--- 666,670 ----
  		#if TARGET_API_MAC_CARBON == 1
  				
! 			theErr = PMGetFirstPage(printsettings, &firstPage);
  			if (theErr == noErr){
  				theErr = PMGetLastPage(printsettings, &lastPage);
***************
*** 675,679 ****
  			
  			#if TARGET_API_MAC_CARBON == 1
! 			theErr = PMSessionBeginPage(hp, pageformat, &shellprintinfo.pagerect);
  			if (theErr != noErr)
  				break;
--- 683,687 ----
  			
  			#if TARGET_API_MAC_CARBON == 1
! 			theErr = PMSessionBeginPage(hp, pageformat, (PMRect *) &shellprintinfo.pagerect);
  			if (theErr != noErr)
  				break;
***************
*** 685,689 ****
  				GrafPtr thePort, oldPort;
  				GetPort(&oldPort);
! 				theErr = PMSessionGetGraphicsContext(hp, nil, &thePort);//the second parameter is currently ignored.
  				SetPort(thePort);
  				// Draw the page
--- 693,697 ----
  				GrafPtr thePort, oldPort;
  				GetPort(&oldPort);
! 				theErr = PMSessionGetGraphicsContext(hp, nil, (void **) &thePort);//the second parameter is currently ignored.
  				SetPort(thePort);
  				// Draw the page

Index: shellscroll.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellscroll.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shellscroll.c	23 Oct 2004 22:55:53 -0000	1.2
--- shellscroll.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 225,229 ****
  static pascal void shellhorizscroll (hdlscrollbar ctrl, short part) {
  	
- 	register WindowPtr w = shellwindow;
  	register hdlwindowinfo h = shellwindowinfo;
  	boolean flleft, flpage;
--- 225,228 ----
***************
*** 251,255 ****
  static pascal void shellvertscroll (hdlscrollbar ctrl, short part) {
  	
- 	register WindowPtr w = shellwindow;
  	register hdlwindowinfo h = shellwindowinfo;
  	boolean flup, flpage;
--- 250,253 ----
***************
*** 321,325 ****
  static ControlRef   gControl;
  static SInt32		gValueSlop;
! static SInt32		gSaveValue;
  static SInt32		gStartValue;
  
--- 319,323 ----
  static ControlRef   gControl;
  static SInt32		gValueSlop;
! //static SInt32		gSaveValue;
  static SInt32		gStartValue;
  
***************
*** 485,489 ****
  static OSErr BeginThumbTracking ( ControlRef theControl ) {
  
- 	const SInt32 kMinLowMem	= 512;
  	OSErr theErr = noErr;
  	Point thePoint;
--- 483,486 ----
***************
*** 512,516 ****
  static void EndThumbTracking ( void ) {
  	
! 	hdlwindowinfo h = shellwindowinfo;
  
  	EnableDrawing ();
--- 509,513 ----
  static void EndThumbTracking ( void ) {
  	
! //	hdlwindowinfo h = shellwindowinfo;
  
  	EnableDrawing ();
***************
*** 530,534 ****
  extern void shellinitscroll ();
  
! void shellinitscroll()
  {
  	//Code change by Timothy Paustian Saturday, July 22, 2000 12:04:35 AM
--- 527,531 ----
  extern void shellinitscroll ();
  
! void shellinitscroll(void)
  {
  	//Code change by Timothy Paustian Saturday, July 22, 2000 12:04:35 AM
***************
*** 545,549 ****
  extern void shellshutdownscroll ();
  
! void shellshutdownscroll()
  {
  	#if TARGET_API_MAC_CARBON
--- 542,546 ----
  extern void shellshutdownscroll ();
  
! void shellshutdownscroll(void)
  {
  	#if TARGET_API_MAC_CARBON
***************
*** 559,563 ****
  void shellscroll (boolean flvert, hdlscrollbar sb, short part, Point pt) {
  	
! 	register WindowPtr w = shellwindow;
  	register long oldscrollbarcurrent;
  	#if TARGET_API_MAC_CARBON != 1
--- 556,560 ----
  void shellscroll (boolean flvert, hdlscrollbar sb, short part, Point pt) {
  	
! //	register WindowPtr w = shellwindow;
  	register long oldscrollbarcurrent;
  	#if TARGET_API_MAC_CARBON != 1
***************
*** 566,573 ****
  	#endif
  	
! 	/*
! 	pushclip ((*w).portRect); /*allow drawing in whole window%/
! 	*/
! 	
  	if (part == kControlIndicatorPart) {
  		
--- 563,568 ----
  	#endif
  	
! 	//pushclip ((*w).portRect); /*allow drawing in whole window%/
! 		
  	if (part == kControlIndicatorPart) {
  		
***************
*** 584,588 ****
  			BeginThumbTracking (sb);
  			
! 			TrackControl (sb, pt, shelllivescrollupp);
  			
  			EndThumbTracking ();			
--- 579,583 ----
  			BeginThumbTracking (sb);
  			
! 			TrackControl (sb, pt, (ControlActionUPP) shelllivescrollupp);
  			
  			EndThumbTracking ();			

Index: oplist.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oplist.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** oplist.c	29 Oct 2004 09:02:22 -0000	1.3
--- oplist.c	1 Nov 2004 11:50:16 -0000	1.4
***************
*** 97,101 ****
  	if (cb)
  		return ((*cb) ((**hnode).hrefcon));
! 	} /*oplistreleaserefcon*/
  
  
--- 97,102 ----
  	if (cb)
  		return ((*cb) ((**hnode).hrefcon));
! 	} /%oplistreleaserefcon%/
! */
  
  
***************
*** 657,661 ****
  	disktomemlong (info.ctoutlinebytes);
  	
! 	if (info.versionnumber == 0x01000000) // handle pre-swapped objects (unswap)
  		info.versionnumber = 0x01;
  	
--- 658,662 ----
  	disktomemlong (info.ctoutlinebytes);
  	
! 	if (info.versionnumber == 0x0100) // handle pre-swapped objects (unswap) - 2004-10-31 aradke: was 0x01000000 but that's not a short!
  		info.versionnumber = 0x01;
  	

Index: langdialog.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langdialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langdialog.c	23 Oct 2004 22:23:51 -0000	1.2
--- langdialog.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 323,330 ****
  	RgnHandle	visRgn;
  	
! 	fllangdialog = (w == langmodaldialog);
  	
  	for (ix = 0; (!fllangdialog) && (ix < topdialog); ++ix)
! 		if (dialogstack [ix].pdialog == w)
  			fllangdialog = true;
  	
--- 323,330 ----
  	RgnHandle	visRgn;
  	
! 	fllangdialog = (w == (WindowPtr) langmodaldialog);
  	
  	for (ix = 0; (!fllangdialog) && (ix < topdialog); ++ix)
! 		if ((WindowPtr) dialogstack [ix].pdialog == w)
  			fllangdialog = true;
  	
***************
*** 347,351 ****
  			visRgn = NewRgn();
  			GetWindowRegion(w, kWindowUpdateRgn, visRgn);
! 			UpdateDialog (w, visRgn);
  			DisposeRgn(visRgn);
  			#else
--- 347,351 ----
  			visRgn = NewRgn();
  			GetWindowRegion(w, kWindowUpdateRgn, visRgn);
! 			UpdateDialog ((DialogRef) w, visRgn);
  			DisposeRgn(visRgn);
  			#else
***************
*** 354,358 ****
  			UpdateDialog (w, (*w).visRgn);
  			#endif
! 			modaldialogcallback (w, ev, &item);
  			
  			EndUpdate (w);
--- 354,358 ----
  			UpdateDialog (w, (*w).visRgn);
  			#endif
! 			modaldialogcallback ((DialogPtr) w, ev, &item);
  			
  			EndUpdate (w);
***************
*** 430,435 ****
  	langdisposetree (hparam);
  	
! 	if (pdialog != getfrontwindow ()) /*this can happen under the debugger*/
! 		windowbringtofront (pdialog);
  	
  	if (!fl)
--- 430,435 ----
  	langdisposetree (hparam);
  	
! 	if ((WindowPtr) pdialog != getfrontwindow ()) /*this can happen under the debugger*/
! 		windowbringtofront ((WindowPtr) pdialog);
  	
  	if (!fl)

Index: langerrorwindow.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langerrorwindow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langerrorwindow.c	23 Oct 2004 22:24:35 -0000	1.2
--- langerrorwindow.c	1 Nov 2004 11:50:17 -0000	1.3
***************
*** 64,72 ****
  	unsigned short lnum, cnum; /*location of error, passed to callback routine*/
  	
! 	/*
! 	callback errorcallback; /*routine to call when user hits script button%/
  	
! 	long errorrefcon; /*the info we pass him%/
! 	*/
  	
  	hdlerrorstack herrorstack;
--- 64,70 ----
  	unsigned short lnum, cnum; /*location of error, passed to callback routine*/
  	
! 	//callback errorcallback; /*routine to call when user hits script button*/
  	
! 	//long errorrefcon; /*the info we pass him*/
  	
  	hdlerrorstack herrorstack;
***************
*** 119,123 ****
  		return (false);
  	
! 	return (shellsetscrap (htext, textscraptype, disposehandle, nil));
  	} /*langerrorcopy*/
  
--- 117,121 ----
  		return (false);
  	
! 	return (shellsetscrap (htext, textscraptype, (shelldisposescrapcallback) disposehandle, nil));
  	} /*langerrorcopy*/
  
***************
*** 508,512 ****
  		return (false);
  	
! 	ix = ix = (**hs).toperror - itemselected;
  	
  	pe = &(**hs).stack [ix];
--- 506,510 ----
  		return (false);
  	
! 	ix = (**hs).toperror - itemselected;
  	
  	pe = &(**hs).stack [ix];

Index: oppack.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oppack.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** oppack.c	23 Oct 2004 22:42:47 -0000	1.2
--- oppack.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 91,99 ****
  	#define diskchdivide			((byte) 0xd6)	/* 'Ö' */
  	#define diskchellipses			((byte) 0xc9)	/* 'É' */
- #endif
- 
- 
- static byte bsellipses [] = "\x03...";
  
  
  #define opversionnumber 2
--- 91,97 ----
  	#define diskchdivide			((byte) 0xd6)	/* 'Ö' */
  	#define diskchellipses			((byte) 0xc9)	/* 'É' */
  
+ 	static byte bsellipses [] = "\x03...";
+ #endif
  
  #define opversionnumber 2
***************
*** 163,167 ****
  
  
! static boolean outtablevisit (hdlheadrecord hnode, ptroppackinfo packinfo) {
  	
  	/*
--- 161,165 ----
  
  
! static boolean outtablevisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
  	/*
***************
*** 176,179 ****
--- 174,178 ----
  	register Handle hrefcon = (**hn).hrefcon;
  	register long lenrefcon;
+ 	ptroppackinfo packinfo = (ptroppackinfo) refcon;
  	tylinetableitem item;
  	
***************
*** 305,308 ****
--- 304,309 ----
  
  
+ #if 0
+ 
  static boolean xxxpushstringtodisk (bigstring bssource, bigstring bsdest) {
  
***************
*** 371,374 ****
--- 372,377 ----
  	} /*pushstringtodisk*/
  
+ #endif
+ 
  
  static boolean outtextvisit (hdlheadrecord hnode, ptroppackinfo packinfo) {
***************
*** 440,444 ****
  	packinfo.flpackcomments = true;
  	
! 	if (!opsiblingvisiter (hnode, false, &outtextvisit, &packinfo))
  		return (false);
  	
--- 443,447 ----
  	packinfo.flpackcomments = true;
  	
! 	if (!opsiblingvisiter (hnode, false, (opvisitcallback) &outtextvisit, &packinfo))
  		return (false);
  	
***************
*** 636,640 ****
  
  
! static boolean intablevisit (hdlheadrecord hnode, ptroppackinfo packinfo) {
  	
  	/*
--- 639,643 ----
  
  
! static boolean intablevisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
  	/*
***************
*** 643,646 ****
--- 646,650 ----
  	
  	register hdlheadrecord hn = hnode;
+ 	ptroppackinfo packinfo = (ptroppackinfo) refcon;
  	register long lenrefcon;
  	Handle hrefcon;
***************
*** 781,785 ****
  	
  /*
! 	while (*p == chtab) { /*count the leading tab chars
  
  		ct++;
--- 785,789 ----
  	
  /*
! 	while (*p == chtab) { /%count the leading tab chars
  
  		ct++;
***************
*** 789,793 ****
  		ixtext++;
  		
! 		if (ixtext >= sizetext) /*no text on the line
  			return (false);
  		
--- 793,797 ----
  		ixtext++;
  		
! 		if (ixtext >= sizetext) /%no text on the line
  			return (false);
  		
***************
*** 797,801 ****
  	if (!fltabindent) {
  		
! 		while (*p == chspace) { /*count the leading tab chars
  			
  			ct++;
--- 801,805 ----
  	if (!fltabindent) {
  		
! 		while (*p == chspace) { /%count the leading tab chars
  			
  			ct++;
***************
*** 805,809 ****
  			ixtext++;
  			
! 			if (ixtext >= sizetext) /*no text on the line
  				return (false);
  			}
--- 809,813 ----
  			ixtext++;
  			
! 			if (ixtext >= sizetext) /%no text on the line
  				return (false);
  			}
***************
*** 811,815 ****
  		if (ct > 0) {
  			
! 			if (spacesforlevel == 0) /*first run of spaces
  				spacesforlevel = (short) ct;
  			
--- 815,819 ----
  		if (ct > 0) {
  			
! 			if (spacesforlevel == 0) /%first run of spaces
  				spacesforlevel = (short) ct;
  			
***************
*** 878,882 ****
  	
  	register hdlheadrecord h = nil;
! 	register short lastlevel;
  	register tydirection dir;
  	Handle hlinetext;
--- 882,886 ----
  	
  	register hdlheadrecord h = nil;
! 	register short lastlevel = 0;
  	register tydirection dir;
  	Handle hlinetext;
***************
*** 1262,1266 ****
  
  
! static boolean outscrapvisit (hdlheadrecord hnode, ptroppackinfo packinfo) {
  	
  	/*
--- 1266,1270 ----
  
  
! static boolean outscrapvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
  	/*
***************
*** 1271,1274 ****
--- 1275,1279 ----
  	
  	register hdlheadrecord h = hnode;
+ 	ptroppackinfo packinfo = (ptroppackinfo) refcon;
  	handlestream *s;
  	
***************
*** 1370,1374 ****
  boolean opsuboutlinetonewtextscrap (hdlheadrecord hnode, Handle *htext) {
  	
! 	/*
  	similar to opoutlinetotextscrap above, but allocated new handle and 
  	only visits hnode and its subheads
--- 1375,1379 ----
  boolean opsuboutlinetonewtextscrap (hdlheadrecord hnode, Handle *htext) {
  	
! 	/%
  	similar to opoutlinetotextscrap above, but allocated new handle and 
  	only visits hnode and its subheads
***************
*** 1390,1395 ****
  	
  	return (false);
! 	} /*opsuboutlinetonewtextscrap*/
! 
  
  
--- 1395,1400 ----
  	
  	return (false);
! 	} /%opsuboutlinetonewtextscrap%/
! */
  
  

Index: langcard.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langcard.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langcard.c	23 Oct 2004 22:23:24 -0000	1.2
--- langcard.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 376,380 ****
  			disposehandle (hcard);
  			
! 			langerror (0); //***
  			
  			return (false);
--- 376,380 ----
  			disposehandle (hcard);
  			
! 			langerror (0);
  			
  			return (false);
***************
*** 386,391 ****
  	else
  		fl = uisOpenHandle (hcard, true, bscard, 0, 0, nil);
! 	
! 	/*
  	uisClose ();
  	*/
--- 386,390 ----
  	else
  		fl = uisOpenHandle (hcard, true, bscard, 0, 0, nil);
! 
  	uisClose ();
  	*/

Index: ophoist.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/ophoist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ophoist.c	23 Oct 2004 22:40:52 -0000	1.2
--- ophoist.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 47,51 ****
  
  
! static void ophoistdisplay (void) {
  	
  	/*
--- 47,51 ----
  
  
! void ophoistdisplay (void) {
  	
  	/*

Index: opdraggingmove.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opdraggingmove.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** opdraggingmove.c	23 Oct 2004 22:39:36 -0000	1.2
--- opdraggingmove.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 373,379 ****
  
  
! static boolean movetohotspotvisit (hdlheadrecord hnode, ptrdraginfo draginfo) {
  	
  	register hdlheadrecord h = hnode;
  	register hdlheadrecord hpre = (*draginfo).hnode;
  	tydirection dir = (*draginfo).dir;
--- 373,380 ----
  
  
! static boolean movetohotspotvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
  	register hdlheadrecord h = hnode;
+ 	ptrdraginfo draginfo = (ptrdraginfo) refcon;
  	register hdlheadrecord hpre = (*draginfo).hnode;
  	tydirection dir = (*draginfo).dir;
***************
*** 433,437 ****
  	
  	register tyhotspot *hs = hotspot;
! 	hdlheadrecord hsource = (*hs).hsource;
  	hdlheadrecord htarget = (*hs).htarget;
  	tydirection dir = (*hs).dir;
--- 434,438 ----
  	
  	register tyhotspot *hs = hotspot;
! 	//hdlheadrecord hsource = (*hs).hsource;
  	hdlheadrecord htarget = (*hs).htarget;
  	tydirection dir = (*hs).dir;
***************
*** 492,496 ****
  	/*DW 9/3/93 -- defend against the target getting deleted in predragcallback*/ {
  	
! 		hdlheadrecord htargetparent = (**htarget).headlinkleft;
  		
  		switch ((*(**outlinedata).predragcallback) (&htarget, &dir)) {
--- 493,497 ----
  	/*DW 9/3/93 -- defend against the target getting deleted in predragcallback*/ {
  	
! 		//hdlheadrecord htargetparent = (**htarget).headlinkleft;
  		
  		switch ((*(**outlinedata).predragcallback) (&htarget, &dir)) {
***************
*** 551,555 ****
  
  
! static void opscrollfordrag (tyhotspot *hotspot, tydirection scrolldir) {
  	
  	register hdloutlinerecord ho = outlinedata;
--- 552,556 ----
  
  
! void opscrollfordrag (tyhotspot *hotspot, tydirection scrolldir) {
  	
  	register hdloutlinerecord ho = outlinedata;

Index: menupack.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menupack.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** menupack.c	23 Oct 2004 22:36:46 -0000	1.2
--- menupack.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 118,122 ****
  
  
! static boolean headleveloffsetvisit (hdlheadrecord hnode, long *headleveloffset) {
  	
  	(**hnode).headlevel += *headleveloffset;
--- 118,124 ----
  
  
! static boolean headleveloffsetvisit (hdlheadrecord hnode, ptrvoid refcon) {
! 	
! 	long *headleveloffset = (long *) refcon;
  	
  	(**hnode).headlevel += *headleveloffset;
***************
*** 204,210 ****
  
  
! static boolean mesavescriptvisit (hdlheadrecord hnode, ptrpackinfo packinfo) {
  	
  	register hdlheadrecord h = hnode;
  	register hdloutlinerecord ho;
  	tymenuiteminfo item;
--- 206,213 ----
  
  
! static boolean mesavescriptvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
  	register hdlheadrecord h = hnode;
+ 	//ptrpackinfo packinfo = (ptrpackinfo) refcon;
  	register hdloutlinerecord ho;
  	tymenuiteminfo item;
***************
*** 290,294 ****
  
  
! static boolean mepackscriptvisit (hdlheadrecord hnode, ptrpackinfo packinfo) {
  	
  	/*
--- 293,297 ----
  
  
! static boolean mepackscriptvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
  	/*
***************
*** 298,301 ****
--- 301,305 ----
  	
  	register hdlheadrecord h = hnode;
+ 	ptrpackinfo packinfo = (ptrpackinfo) refcon;
  	register hdloutlinerecord ho;
  	tymenuiteminfo item;
***************
*** 366,370 ****
  
  
! static boolean mepackmenustructure (tysavedmenuinfo *info, Handle *hpacked) {
  	
  	/*
--- 370,374 ----
  
  
! boolean mepackmenustructure (tysavedmenuinfo *info, Handle *hpacked) {
  	
  	/*
***************
*** 432,436 ****
  	register WindowPtr w;
  	Rect r;
- 	long ixload = 0;
  	long lnumcursor;
  	
--- 436,439 ----
***************
*** 551,555 ****
  
  
! static boolean mesetupmenurecord (tysavedmenuinfo *info, hdloutlinerecord houtline, hdlmenurecord *hmenurecord) { 
  	
  	/*
--- 554,558 ----
  
  
! boolean mesetupmenurecord (tysavedmenuinfo *info, hdloutlinerecord houtline, hdlmenurecord *hmenurecord) { 
  	
  	/*
***************
*** 603,607 ****
  
  
! static boolean meunpackscriptvisit (hdlheadrecord hnode, ptrpackinfo packinfo) {
  	
  	/*
--- 606,610 ----
  
  
! static boolean meunpackscriptvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
  	/*
***************
*** 610,613 ****
--- 613,617 ----
  	
  	register hdlheadrecord h = hnode;
+ 	ptrpackinfo packinfo = (ptrpackinfo) refcon;
  	hdloutlinerecord houtline;
  	tymenuiteminfo item;
***************
*** 765,769 ****
  boolean mesetscraproutine (hdloutlinerecord houtline) {
  	
! 	return (shellsetscrap ((Handle) houtline, menuscraptype, &medisposescrap, &meexportscrap));
  	} /*mesetscraproutine*/
  
--- 769,775 ----
  boolean mesetscraproutine (hdloutlinerecord houtline) {
  	
! 	return (shellsetscrap ((Handle) houtline, menuscraptype,
! 								(shelldisposescrapcallback) &medisposescrap,
! 								(shellexportscrapcallback) &meexportscrap));
  	} /*mesetscraproutine*/
  

Index: langhash.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langhash.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** langhash.c	31 Oct 2004 21:43:38 -0000	1.3
--- langhash.c	1 Nov 2004 11:50:17 -0000	1.4
***************
*** 1310,1314 ****
  			
  			x = nextx;
! 			} /*while%/
  			
  		(**hsource).hashbucket [i] = nil; /%we leave the source table empty%/
--- 1310,1314 ----
  			
  			x = nextx;
! 			} /%while%/
  			
  		(**hsource).hashbucket [i] = nil; /%we leave the source table empty%/

Index: langparser.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langparser.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langparser.c	23 Oct 2004 22:29:14 -0000	1.2
--- langparser.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 52,56 ****
  
  
! static FILE __file[1];
  
  static int fprintf (FILE *f, const char *s, ...) {return (0);}
--- 52,56 ----
  
  
! //static FILE __file[1];
  
  static int fprintf (FILE *f, const char *s, ...) {return (0);}
***************
*** 62,65 ****
--- 62,66 ----
  static int strcmp (const char * str1, const char * str2) {return (0);}
  
+ 
  /*
  10/2/91 dmb: a disturbing discovery -- our error handling doesn't deallocate 
***************
*** 537,541 ****
  
  
! yyparse()
  {
    int statestack[YYMAXDEPTH]; /* state stack */
--- 538,542 ----
  
  
! int yyparse(void)
  {
    int statestack[YYMAXDEPTH]; /* state stack */
***************
*** 624,628 ****
          case WAS0ERR:          /* an error just occurred */
            yyerror("syntax error");
!           yyerrlab:
              ++pcyyerrct;
          case WAS1ERR:
--- 625,629 ----
          case WAS0ERR:          /* an error just occurred */
            yyerror("syntax error");
!           //yyerrlab:
              ++pcyyerrct;
          case WAS1ERR:

Index: shellupdate.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellupdate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shellupdate.c	23 Oct 2004 22:56:32 -0000	1.2
--- shellupdate.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 270,274 ****
  		#ifdef MACVERSION
  			#if TARGET_API_MAC_CARBON == 1
! 			ValidWindowRgn(hw, contentrgn);
  			#else
  			ValidRgn (contentrgn); /*no need to draw it again.  do now to simulate beginupdate*/
--- 270,274 ----
  		#ifdef MACVERSION
  			#if TARGET_API_MAC_CARBON == 1
! 			ValidWindowRgn((WindowRef) hw, contentrgn);
  			#else
  			ValidRgn (contentrgn); /*no need to draw it again.  do now to simulate beginupdate*/

Index: shellmouse.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmouse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shellmouse.c	23 Oct 2004 22:54:43 -0000	1.2
--- shellmouse.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 199,203 ****
--- 199,205 ----
  	WindowPtr macwindow;
  	register WindowPtr w;
+ #ifdef WIN95VERSION		
  	tyclickflags flags = clicknormal;
+ #endif
  
  	#ifdef MACVERSION
***************
*** 506,510 ****
  static void shellinstallmousewheelhandler (void) {
  	
- 	OSErr ec = noErr;		
  	EventTypeSpec myevents = {kEventClassMouse, kEventMouseWheelMoved};
  	
--- 508,511 ----

Index: langerror.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langerror.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** langerror.c	23 Oct 2004 22:24:19 -0000	1.2
--- langerror.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 62,66 ****
  static boolean fllocalerrorhook = false;
  
! langerrordispatch (bigstring bs) { /**finish this someday%/
  	
  	hdltreenode hcode;
--- 62,66 ----
  static boolean fllocalerrorhook = false;
  
! langerrordispatch (bigstring bs) { /%finish this someday%/
  	
  	hdltreenode hcode;
***************
*** 76,81 ****
  	
  	langerrormessage (bs);
! 	} /*langerrordispatch*/
! 
  
  void langerror (short stringnum) {
--- 76,81 ----
  	
  	langerrormessage (bs);
! 	} /%langerrordispatch%/
! */
  
  void langerror (short stringnum) {

Index: oplangtext.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oplangtext.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** oplangtext.c	23 Oct 2004 22:41:50 -0000	1.2
--- oplangtext.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 95,99 ****
  
  
! static boolean oplangtextvisit (hdlheadrecord hnode, handlestream *langtext) {
  	
  	/*
--- 95,99 ----
  
  
! static boolean oplangtextvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
  	/*
***************
*** 131,134 ****
--- 131,135 ----
  	
  	register hdlheadrecord h = hnode;
+ 	handlestream *langtext = (handlestream *) refcon;
  	register short level;
  	bigstring bs;

Index: oppopup.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oppopup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** oppopup.c	23 Oct 2004 22:42:59 -0000	1.2
--- oppopup.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 58,65 ****
  static hdlmenurecord oppopupmenubar; /*current popup menu*/
  
- static unsigned long popupstartticks = 0; /*7.0b27 PBS: when menu was started. Used to make sure menu appeared minimum amount of ticks.*/
- 
- static popupticksminimum = 20; /*7.0b27 PBS*/
- 
  static boolean opbuildpopupmenu (hdlheadrecord hnode, hdlmenu hmenu);
  
--- 58,61 ----
***************
*** 70,73 ****
--- 66,76 ----
  short currmenuid;
  
+ #ifdef WIN95VERSION
+ 
+ 	static unsigned long popupstartticks = 0; /*7.0b27 PBS: when menu was started. Used to make sure menu appeared minimum amount of ticks.*/
+ 
+ 	static unsigned long popupticksminimum = 20; /*7.0b27 PBS*/
+ 
+ #endif
  
  #if MACVERSION

Index: menuverbs.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menuverbs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** menuverbs.c	23 Oct 2004 22:37:13 -0000	1.2
--- menuverbs.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 120,124 ****
  
  		
! static errornum = 0; /*error number exclusively for menu routines*/
  
  
--- 120,124 ----
  
  		
! static short errornum = 0; /*error number exclusively for menu routines*/
  
  
***************
*** 223,227 ****
  	*/
  	
- 	register hdlmenuvariable hv = (hdlmenuvariable) hvariable;
  	long ctheads;
  	
--- 223,226 ----
***************
*** 484,488 ****
  
  
! static boolean mefindusedblocksvisit (hdlheadrecord hnode, ptrstring bsparent) {
  	
  	/*
--- 483,487 ----
  
  
! static boolean mefindusedblocksvisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
  	/*
***************
*** 490,493 ****
--- 489,493 ----
  	*/
  	
+ 	ptrstring bsparent = (ptrstring) refcon;
  	tymenuiteminfo item;
  	bigstring bspath;
***************
*** 1181,1185 ****
  	shellpopglobals ();
  	
! 	/* meunloadscript (); /*detach the script from the window*/
  	
  	(**hm).scriptnode = nil;
--- 1181,1185 ----
  	shellpopglobals ();
  	
! 	// meunloadscript (); /*detach the script from the window*/
  	
  	(**hm).scriptnode = nil;
***************
*** 1259,1271 ****
  	
  	/*
! 	megetmenuiteminfo (hcursor, &item); /*gets prior cmd key, or clears bytes%/
  	
  	mereleaserefconroutine (hcursor, true);
  	
! 	(**hcopy).fldirty = true; /*force save on this guy's script%/
  	
  	item.linkedscript.houtline = hcopy;
  	
! 	item.linkedscript.adrlink = nildbaddress; /*hasn't been allocated yet%/
  	
  	mesetmenuiteminfo (hcursor, &item);
--- 1259,1271 ----
  	
  	/*
! 	megetmenuiteminfo (hcursor, &item); /%gets prior cmd key, or clears bytes%/
  	
  	mereleaserefconroutine (hcursor, true);
  	
! 	(**hcopy).fldirty = true; /%force save on this guy's script%/
  	
  	item.linkedscript.houtline = hcopy;
  	
! 	item.linkedscript.adrlink = nildbaddress; /%hasn't been allocated yet%/
  	
  	mesetmenuiteminfo (hcursor, &item);
***************
*** 1289,1294 ****
  
  
! static boolean findheadlinevisit (hdlheadrecord hnode, ptrfindinfo findinfo) {
  	
  	bigstring bs;
  	
--- 1289,1295 ----
  
  
! static boolean findheadlinevisit (hdlheadrecord hnode, ptrvoid refcon) {
  	
+ 	ptrfindinfo findinfo = (ptrfindinfo) refcon;
  	bigstring bs;
  	
***************
*** 2311,2315 ****
  	(*cb).gettargetdataroutine = &menuverbgettargetdata;
  	
! 	(*cb).getvariableroutine = &menuverbgetvariable;
  	
  	(*cb).settextmoderoutine = &opsettextmode;
--- 2312,2316 ----
  	(*cb).gettargetdataroutine = &menuverbgettargetdata;
  	
! 	(*cb).getvariableroutine = (shellgetvariablecallback) &menuverbgetvariable;
  	
  	(*cb).settextmoderoutine = &opsettextmode;

Index: langipc.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langipc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** langipc.c	31 Oct 2004 21:43:38 -0000	1.4
--- langipc.c	1 Nov 2004 11:50:16 -0000	1.5
***************
*** 198,202 ****
  	shellpoperrorhook ();
  	
! 	langcallbacks.errormessagecallback = (errorhookcallback) savecallback;
  	
  	fllangerror = false; /*make sure error flag is cleared*/
--- 198,202 ----
  	shellpoperrorhook ();
  	
! 	langcallbacks.errormessagecallback = (langerrormessagecallback) savecallback;
  	
  	fllangerror = false; /*make sure error flag is cleared*/
***************
*** 3376,3380 ****
  static AEDesc *fastreply;
  
! static callback fastsavecallback;
  
  
--- 3376,3380 ----
  static AEDesc *fastreply;
  
! static langerrormessagecallback fastsavecallback;
  
  
***************
*** 3399,3403 ****
  static void langipchookfasterrors (AEDesc *reply) {
  	
! 	fastsavecallback = (callback) langcallbacks.errormessagecallback;
  	
  	langcallbacks.errormessagecallback = &langipcfasterror;
--- 3399,3403 ----
  static void langipchookfasterrors (AEDesc *reply) {
  	
! 	fastsavecallback = langcallbacks.errormessagecallback;
  	
  	langcallbacks.errormessagecallback = &langipcfasterror;
***************
*** 3413,3417 ****
  	shellpoperrorhook ();
  	
! 	langcallbacks.errormessagecallback = (errorhookcallback) fastsavecallback;
  	
  	oserror (noErr); /*clear it out to avoid conflicts with current thread*/
--- 3413,3417 ----
  	shellpoperrorhook ();
  	
! 	langcallbacks.errormessagecallback = fastsavecallback;
  	
  	oserror (noErr); /*clear it out to avoid conflicts with current thread*/

Index: shellundo.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellundo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shellundo.c	23 Oct 2004 22:56:18 -0000	1.2
--- shellundo.c	1 Nov 2004 11:50:16 -0000	1.3
***************
*** 181,185 ****
  static boolean pushactionstep (short ixaction, long globaldata) {
  	
! 	return (pushstep ((undocallback) ixaction, (Handle) globaldata, true));
  	} /*pushactionstep*/
  
--- 181,185 ----
  static boolean pushactionstep (short ixaction, long globaldata) {
  	
! 	return (pushstep ((undocallback) ((long) ixaction), (Handle) globaldata, true));
  	} /*pushactionstep*/
  
***************
*** 325,329 ****
  		if (step.flactionstep) { /*new action record; finished with this undo*/
  			
! 			ixaction = (short) step.undoroutine;
  			
  			globaldata = (long) step.hundodata;
--- 325,329 ----
  		if (step.flactionstep) { /*new action record; finished with this undo*/
  			
! 			ixaction = (short) ((long) step.undoroutine);
  			
  			globaldata = (long) step.hundodata;
***************
*** 378,382 ****
  		if (step.flactionstep) { /*new action record; finished with this undo*/
  			
! 			ixaction = (short) step.undoroutine;
  			
  			globaldata = (long) step.hundodata;
--- 378,382 ----
  		if (step.flactionstep) { /*new action record; finished with this undo*/
  			
! 			ixaction = (short) ((long) step.undoroutine);
  			
  			globaldata = (long) step.hundodata;

Index: menueditor.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menueditor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** menueditor.c	23 Oct 2004 22:36:17 -0000	1.2
--- menueditor.c	1 Nov 2004 11:50:17 -0000	1.3
***************
*** 161,165 ****
  
  
! static medeactivateoutline (void) {
  	
  	mecheckglobals ();
--- 161,166 ----
  
  
! /*
! static boolean medeactivateoutline (void) {
  	
  	mecheckglobals ();
***************
*** 169,174 ****
  	
  	return (true);
! 	} /*medeactivateoutline*/
! 
  
  static void meactivateoutline (void) {
--- 170,175 ----
  	
  	return (true);
! 	} /%medeactivateoutline%/
! */
  
  static void meactivateoutline (void) {
***************
*** 926,930 ****
  static medisplaycmdkey (void) { 
  	
! 	/*
  	10/7/91 dmb: resurrected the seperate item for the setting the command key
  	%/
--- 927,931 ----
  static medisplaycmdkey (void) { 
  	
! 	/%
  	10/7/91 dmb: resurrected the seperate item for the setting the command key
  	%/
***************
*** 971,975 ****
  	
  	closebitmap (menuwindow);
! 	} /*medisplaycmdkey*/
  
  
--- 972,977 ----
  	
  	closebitmap (menuwindow);
! 	} /%medisplaycmdkey%/
! */
  
  
***************
*** 1066,1070 ****
  	popport ();
  	
! 	/*windowsetchanges (menuwindow, true); /*the window is dirty*/	
  	
  	return (true);
--- 1068,1072 ----
  	popport ();
  	
! 	//windowsetchanges (menuwindow, true); /*the window is dirty*/	
  	
  	return (true);
***************
*** 1335,1339 ****
  	mezoomscriptwindow ();
  	
! 	/*windowsetchanges (menuwindow, true); /*the window is dirty*/
  	
  	return (true);
--- 1337,1341 ----
  	mezoomscriptwindow ();
  	
! 	//windowsetchanges (menuwindow, true); /*the window is dirty*/
  	
  	return (true);
***************
*** 1387,1391 ****
  			(**menudata).menuactiveitem = item;
  			
! 			medisplaycmdkey (); /*show it in its active form%/
  			
  			break;
--- 1389,1393 ----
  			(**menudata).menuactiveitem = item;
  			
! 			medisplaycmdkey (); /%show it in its active form%/
  			
  			break;
***************
*** 1429,1433 ****
  merotateactiveitem (boolean flforward) {
  	
! 	/*
  	this is ...
 
[truncated message content]