frontierkernel-commits — Mailing list for Subversion commit messages.

[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/Frontier installApp,1.2,1.3,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/Frontier
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15418

Modified Files:
	installApp 
Log Message:
relative path handling on Windows is pretty messed up, work around the issue

set relativePath to relative path first thing

changed f to relativePath

Index: installApp
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/Frontier/installApp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** installApp	13 Aug 2005 19:14:35 -0000	1.2
--- installApp	15 Feb 2006 05:11:51 -0000	1.3
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.verbs.builtins.Frontier.installApp
  
! on installApp (appRoot, flRunStartupScript = true) {
	ÇChanges
		Ç7/17/05; 5:35:23 PM by TAC
			Çstore f as relative path, more portable in that one can move folder around with less hassle
		Ç6/13/05; 4:26:18 PM by TAC
			Çmoved from userland table
		Ç11/28/04; 7:51:35 PM by TAC
			Çadded flRunStartupScript
		Ç10/26/99; 6:18:10 PM by PBS
			Çcreated
			ÇInstall one app in the Guest Databases/apps/ folder.
			ÇappRoot is the name of the gdb, as in mainResponder.root or manila.root.
			ÇThis script:
			Ç1) Open the gdb if it's not open.
			Ç2) Creates an entry in user.databases.
			Ç3) Runs the startup script.
	
	local (f = Frontier.getSubFolder ("apps") + appRoot);
	
	if not defined ([f]) {
		fileMenu.open (f, true)}; //open it hidden
	
	ÇAdd an entry to the user.databases table.
	local (adrTable = @user.databases.[appRoot]);
	new (tableType, adrTable);
	adrTable^.f = file.getPathChar () + (f - Frontier.pathString);
	adrTable^.openOnStartup = true;
	adrTable^.runStartupScript = true;
	adrTable^.supportsSubscribe = false;
	
	if flRunStartupScript { // 11/28/04; 7:52:05 PM by TAC - run the startup script
		adrStartupScript = @[f].["#startup"];
		if defined (adrStartupScript^) {
			adrStartupScript^ ()}}; //run the startup script
	
	return (true)}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.verbs.builtins.Frontier.installApp
  
! on installApp (appRoot, flRunStartupScript = true, subFolderName = "apps") {
	ÇChanges
		Ç2/14/06; 4:14:05 PM by TAC
			Çrelative path handling on Windows is pretty messed up, work around the issue
			Çset relativePath to relative path first thing
			Çchanged f to relativePath
		Ç2/8/06 by SSL
			Çadded file.exists test (caveat: assumes that failing silently is ok; others may disagree)
			Çadded subFolderName, can be used for prefs.root (in "www")
		Ç7/17/05; 5:35:23 PM by TAC
			Çstore f as relative path, more portable in that one can move folder around with less hassle
		Ç6/13/05; 4:26:18 PM by TAC
			Çmoved from userland table
		Ç11/28/04; 7:51:35 PM by TAC
			Çadded flRunStartupScript
		Ç10/26/99; 6:18:10 PM by PBS
			Çcreated
			ÇInstall one app in the Guest Databases/apps/ folder.
			ÇappRoot is the name of the gdb, as in mainResponder.root or manila.root.
			ÇThis script:
			Ç1) Open the gdb if it's not open.
			Ç2) Creates an entry in user.databases.
			Ç3) Runs the startup script.
	
	local (relativePath = file.getPathChar () + ((Frontier.getSubFolder (subFolderName) + appRoot) - Frontier.pathString), fullPath = relativePath);
	
	if system.environment.isWindows {
		if fullPath [1] == '\\' {
			delete (@fullPath [1])}};
	
	fullPath = string (fileSpec (fullPath));
	
	if file.exists (fullPath) {
		if not (defined ([fullPath])) {
			fileMenu.open (relativePath, true)}; //open it hidden
		
		ÇAdd an entry to the user.databases table.
		local (adrTable = @user.databases.[appRoot]);
		
		new (tableType, adrTable);
		
		adrTable^.f = relativePath;
		adrTable^.openOnStartup = true;
		adrTable^.runStartupScript = true;
		adrTable^.supportsSubscribe = false;
		
		if flRunStartupScript {
			adrStartupScript = @[fullPath].["#startup"];
			if defined (adrStartupScript^) {
				adrStartupScript^ ()}}; //run the startup script
		
		return (true)}
	else {
		return (false)}}
\ No newline at end of file

[frontierkernel-commits] Frontier/Common/source shellmenu.c,1.13,1.14,

[Karsten W. <kar...@us...>]

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

Modified Files:
	shellmenu.c 
Log Message:
disabling call to shellupdateopenrecentmenu() for classic build; osx specific; commited wrong file previously

Index: shellmenu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmenu.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** shellmenu.c	11 Feb 2006 14:40:34 -0000	1.13
--- shellmenu.c	15 Feb 2006 00:17:51 -0000	1.14
***************
*** 1476,1480 ****
--- 1476,1484 ----
  	
  #ifndef PIKE
+ #	if TARGET_API_MAC_OS8 == 0
+ 	// kw - 2006-02-15 --- due to osx specific implementation, classic isn't
+ 	// allowed to reference shellupdateopenrecentmenu()
  	shellupdateopenrecentmenu ();	/* 2006-02-11 aradke */
+ #	endif
  #endif
  	} /*shellupdatemenus*/

[frontierkernel-commits] Frontier/Common/IOAToolkit ioapicture.c,1.3,1.3.6.1,pre_int64_branch

[Karsten W. <kar...@us...>]

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

Modified Files:
      Tag: pre_int64_branch
	ioapicture.c 
Log Message:
compiler warning fixes

Index: ioapicture.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioapicture.c,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -d -r1.3 -r1.3.6.1
*** ioapicture.c	11 Jan 2005 22:47:38 -0000	1.3
--- ioapicture.c	14 Feb 2006 11:57:43 -0000	1.3.6.1
***************
*** 66,70 ****
  
  static boolean canreplicatepicture (hdlobject h) {
! 	
  	return (true); /*it can be replicated*/
  	} /*canreplicatepicture*/
--- 66,71 ----
  
  static boolean canreplicatepicture (hdlobject h) {
! #pragma unused(h)
! 
  	return (true); /*it can be replicated*/
  	} /*canreplicatepicture*/
***************
*** 72,75 ****
--- 73,77 ----
  
  static boolean getpictureeditrect (hdlobject h, Rect *r) {
+ #pragma unused(h, r)
  
  	return (false); /*text of object can't be edited*/
***************
*** 78,82 ****
  
  static boolean getpicturevalue (hdlobject h, Handle *hvalue) {
! 	
  	return (false); /*picture doesn't have a value for a script*/
  	} /*getpicturevalue*/
--- 80,85 ----
  
  static boolean getpicturevalue (hdlobject h, Handle *hvalue) {
! #pragma unused(h, hvalue)
! 
  	return (false); /*picture doesn't have a value for a script*/
  	} /*getpicturevalue*/
***************
*** 84,87 ****
--- 87,91 ----
  
  static boolean debugpicture (hdlobject h, bigstring errorstring) {
+ #pragma unused(h)
  	
  	setstringlength (errorstring, 0);

[frontierkernel-commits] Frontier/FrontierSDK/Toolkits/IACTools/Source iacbinary.c,1.3,1.3.6.1,pre_int64_branch iactable.c,1.3,1.3.6.1,pre_int64_branch iactext.c,1.3,1.3.6.1,pre_int64_branch

[Karsten W. <kar...@us...>]

Update of /cvsroot/frontierkernel/Frontier/FrontierSDK/Toolkits/IACTools/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25464

Modified Files:
      Tag: pre_int64_branch
	iacbinary.c iactable.c iactext.c 
Log Message:
compiler warning fixes

Index: iactext.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/FrontierSDK/Toolkits/IACTools/Source/iactext.c,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -d -r1.3 -r1.3.6.1
*** iactext.c	11 Jan 2005 22:48:37 -0000	1.3
--- iactext.c	14 Feb 2006 11:46:27 -0000	1.3.6.1
***************
*** 63,75 ****
  	if (ec == noErr) {
  	
! 		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
  
! 			copydatahandle (&desc, val);
! 			
! 		#else
! 		
! 			*val = desc.dataHandle;	
! 		
! 		#endif
  		
  		return (true);
--- 63,77 ----
  	if (ec == noErr) {
  	
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
  
! 		copydatahandle (&desc, val);
! #if AEDISPOSAL == 1
! 		// possible memleak here		
! #endif
! #else
! 
! 		*val = desc.dataHandle;	
! 
! #endif
  		
  		return (true);

Index: iacbinary.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/FrontierSDK/Toolkits/IACTools/Source/iacbinary.c,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -d -r1.3 -r1.3.6.1
*** iacbinary.c	11 Jan 2005 22:48:36 -0000	1.3
--- iacbinary.c	14 Feb 2006 11:46:27 -0000	1.3.6.1
***************
*** 67,79 ****
  		*binaryfieldtype = desc.descriptorType;
  		
! 		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 		
! 			copydatahandle (&desc, val);
! 			
! 		#else
! 		
! 			*val = desc.dataHandle;	
! 		
! 		#endif
  		
  		return (true);
--- 67,82 ----
  		*binaryfieldtype = desc.descriptorType;
  		
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 		copydatahandle (&desc, val);
! #if AEDISPOSAL == 1
! 		// possible memleak here		
! #endif
! 
! #else
! 
! 		*val = desc.dataHandle;	
! 
! #endif
  		
  		return (true);

Index: iactable.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/FrontierSDK/Toolkits/IACTools/Source/iactable.c,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -d -r1.3 -r1.3.6.1
*** iactable.c	11 Jan 2005 22:48:37 -0000	1.3
--- iactable.c	14 Feb 2006 11:46:27 -0000	1.3.6.1
***************
*** 73,85 ****
  	if (ec == noErr) {
  	
! 		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 		
! 			copydatahandle (&desc, val);
! 			
! 		#else
! 		
! 			*val = desc.dataHandle;
! 		
! 		#endif
  		
  		return (true);
--- 73,87 ----
  	if (ec == noErr) {
  	
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 		copydatahandle (&desc, val);
! #if AEDISPOSAL == 1
! 		// possible memleak here		
! #endif
! #else
! 
! 		*val = desc.dataHandle;
! 
! #endif
  		
  		return (true);

[frontierkernel-commits] Frontier/Common/source about.c,1.6.8.1,1.6.8.2,pre_int64_branch fileloop.c,1.5.4.1,1.5.4.2,pre_int64_branch langhtml.c,1.8,1.8.2.1,pre_int64_branch langipc.c,1.6.6.1,1.6.6.2,pre_int64_branch langops.c,1.4.6.2,1.4.6.3,pre_int64_branch langsystypes.c,1.6.2.1,1.6.2.2,pre_int64_branch langvalue.c,1.8.2.2,1.8.2.3,pre_int64_branch langverbs.c,1.12.2.2,1.12.2.3,pre_int64_branch launch.c,1.7,1.7.6.1,pre_int64_branch memory.c,1.6.4.1,1.6.4.2,pre_int64_branch osacomponent.c,1.7.6.1,1.7.6.2,pre_int64_branch quickdraw.c,1.4,1.4.6.1,pre_int64_branch timedate.c,1.10,1.10.4.1,pre_int64_branch uisharing.c,1.5,1.5.6.1,pre_int64_branch

[Karsten W. <kar...@us...>]

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

Modified Files:
      Tag: pre_int64_branch
	about.c fileloop.c langhtml.c langipc.c langops.c 
	langsystypes.c langvalue.c langverbs.c launch.c memory.c 
	osacomponent.c quickdraw.c timedate.c uisharing.c 
Log Message:
sint64 next changes

Index: uisharing.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/uisharing.c,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -C2 -d -r1.5 -r1.5.6.1
*** uisharing.c	11 Jan 2005 22:48:12 -0000	1.5
--- uisharing.c	14 Feb 2006 11:43:57 -0000	1.5.6.1
***************
*** 1183,1195 ****
  		return (false);
  	
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 		copydatahandle (&result, hbinary);
! 		
! 	#else
! 	
! 		*hbinary = result.dataHandle;
  	
! 	#endif
  	
  	*binarytype = result.descriptorType;
--- 1183,1198 ----
  		return (false);
  	
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 	copydatahandle (&result, hbinary);
! #if AEDISPOSAL == 1
! 	// possible memleak here		
! #endif
  	
! #else
! 
! 	*hbinary = result.dataHandle;
! 
! #endif
  	
  	*binarytype = result.descriptorType;
***************
*** 1210,1222 ****
  		return (false);
  	
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 		copydatahandle (&result, &htext);
! 	
! 	#else
! 	
! 		htext = result.dataHandle;
! 	
! 	#endif
  	
  	lenstring = GetHandleSize (htext);
--- 1213,1228 ----
  		return (false);
  	
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 	copydatahandle (&result, &htext);
! #if AEDISPOSAL == 1
! 	// possible memleak here		
! #endif
! 
! #else
! 
! 	htext = result.dataHandle;
! 
! #endif
  	
  	lenstring = GetHandleSize (htext);
***************
*** 1240,1248 ****
  	
  	*errcode = AEGetParamPtr (
! 		
! 		event, (AEKeyword) keyword, typeLongInteger, 
! 		
! 		&actualtype, (Ptr) val, sizeof (long), &actualsize);
! 	
  	if (*errcode != noErr) 
  		return (false);
--- 1246,1257 ----
  	
  	*errcode = AEGetParamPtr (
! 						event,
! 						(AEKeyword) keyword,
! 						typeLongInteger,
! 						&actualtype,
! 						(Ptr) val,
! 						sizeof (long),
! 						&actualsize);
! 
  	if (*errcode != noErr) 
  		return (false);

Index: quickdraw.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/quickdraw.c,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -C2 -d -r1.4 -r1.4.6.1
*** quickdraw.c	11 Jan 2005 22:48:10 -0000	1.4
--- quickdraw.c	14 Feb 2006 11:43:57 -0000	1.4.6.1
***************
*** 250,309 ****
  	return (GetMBarHeight ()); /*call Script Manager routine*/
  #endif
! 
  #ifdef WIN95VERSION
  	return (GetSystemMetrics (SM_CYMENUSIZE));
  #endif
! 	} /*getmenubarheight*/
  
  
- GrafPtr getport (void) {
  
! 	#ifdef MACVERSION	
! 		//Code change by Timothy Paustian Friday, June 9, 2000 9:57:48 PM
! 		//Changed to Opaque call for Carbon
! 		//This is weird, Shouldn't this be calling GetPort()?
! 		#if TARGET_API_MAC_CARBON == 1
! 		return GetQDGlobalsThePort();
! 		#else
! 		return (quickdrawglobal (thePort));
! 		#endif
! 	#endif
  
! 	#ifdef WIN95VERSION
! 		return (currentport);
! 	#endif
! 	} /*getport*/
  
  
  void setport (GrafPtr port) {
  
! 	#ifdef MACVERSION	
! 		SetPort (port);
! 	#endif
  
! 	#ifdef WIN95VERSION
! 		if (winportpushed)
! 			return;
  
! 		if (port != currentport) {
! 			
! 			if (currentport != NULL) {
! 				
! 				ReleaseDC (currentport, currentportDC);
! 				
! 				currentport = NULL;
! 				
! 				currentportDC = NULL;
! 				}
! 			
! 			if (port != NULL) {
! 				
! 				currentport = port;
! 				
! 				currentportDC = GetDC (port);
! 				}
! 			}
! 	#endif
! 	} /*setport*/
  		
  
--- 250,363 ----
  	return (GetMBarHeight ()); /*call Script Manager routine*/
  #endif
! 	
  #ifdef WIN95VERSION
  	return (GetSystemMetrics (SM_CYMENUSIZE));
  #endif
! } /*getmenubarheight*/
  
+ CGrafPtr
+ getmacwindowport(WindowPtr theWindow)
+ {
+ #if TARGET_API_MAC_CARBON == 1
+ 	return(GetWindowPort(theWindow));
+ #else
+ 	return((CGrafPtr)theWindow);
+ #endif
+ }
  
  
! CGrafPtr
! getmacqdglobaltheport(void)
! {
! #if TARGET_API_MAC_CARBON == 1
! 	return(GetQDGlobalsThePort());
! #else
! 	return(qd.thePort);
! #endif
! }
  
! Rect
! getwindowportrect(WindowPtr theWindow)
! {
! #ifdef MACVERSION
! 	
! #	if ACCESSOR_CALLS_ARE_FUNCTIONS == 1
! 	Rect		r;
! 	
! 	CGrafPtr	thePort = GetWindowPort(theWindow);
! 	
! 	GetPortBounds(thePort, &r);
! 	
! 	return(r);
! 	
! #	else
! 	
! 	return ((*theWindow).portRect);
! 	
! #	endif
! #endif
! 	
! #ifdef WIN95VERSION
! 	RECT winrect;
! 	
! 	GetClientRect (theWindow, &winrect);
! 	winrecttorect (&winrect, &r);
! 	
! 	return(r);
! #endif
! }
! 
! void
! invalmacwindowrect(WindowPtr aWindow, Rect aRect)
! {
! #	if TARGET_API_MAC_CARBON == 1
! 	InvalWindowRect (aWindow, &aRect);
! #else
! 	InvalRect (&(*aWindow).portRect);
! #endif
! }
! 
! 
! GrafPtr getport (void) {
! #ifdef MACVERSION
! 	return(getmacqdglobaltheport());
! #endif
! 
! #ifdef WIN95VERSION
! 	return (currentport);
! #endif
! } /*getport*/
  
  
  void setport (GrafPtr port) {
  
! #ifdef MACVERSION	
! 	SetPort (port);
! #endif
  
! #ifdef WIN95VERSION
! 	if (winportpushed)
! 		return;
  
! 	if (port != currentport) {
! 
! 		if (currentport != NULL) {
! 
! 			ReleaseDC (currentport, currentportDC);
! 
! 			currentport = NULL;
! 
! 			currentportDC = NULL;
! 		}
! 
! 		if (port != NULL) {
! 
! 			currentport = port;
! 
! 			currentportDC = GetDC (port);
! 		}
! 	}
! #endif
! } /*setport*/
  		
  

Index: launch.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/launch.c,v
retrieving revision 1.7
retrieving revision 1.7.6.1
diff -C2 -d -r1.7 -r1.7.6.1
*** launch.c	11 Jan 2005 22:48:08 -0000	1.7
--- launch.c	14 Feb 2006 11:43:57 -0000	1.7.6.1
***************
*** 937,951 ****
  	
  	
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 		newdescnull (&addrdesc, typeNull);
! 	
! 	#else
! 	
! 		addrdesc.descriptorType = typeNull;
! 	
! 		addrdesc.dataHandle = nil;
! 	
! 	#endif
  	
  	AECreateAppleEvent (eventclass, eventid, &addrdesc, kAutoGenerateReturnID, kAnyTransactionID, &event);
--- 937,951 ----
  	
  	
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 	newdescnull (&addrdesc, typeNull);
! 
! #else
! 
! 	addrdesc.descriptorType = typeNull;
! 
! 	addrdesc.dataHandle = nil;
! 
! #endif
  	
  	AECreateAppleEvent (eventclass, eventid, &addrdesc, kAutoGenerateReturnID, kAnyTransactionID, &event);
***************
*** 954,972 ****
  		
  		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.*/
! 		
! 			newdescwithhandle (&docdesc, typeAlias, (Handle) halias);
! 			
! 		#else
! 		
! 			docdesc.descriptorType = typeAlias;
! 		
! 			docdesc.dataHandle = (Handle) halias;
! 		
! 		#endif
! 		
  		AEPutDesc (&doclist, 0, &docdesc); /*put alias on the list*/
  		
--- 954,972 ----
  		
  		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.*/
! 
! 		newdescwithhandle (&docdesc, typeAlias, (Handle) halias);
! 
! #else
! 
! 		docdesc.descriptorType = typeAlias;
! 
! 		docdesc.dataHandle = (Handle) halias;
! 
! #endif
! 
  		AEPutDesc (&doclist, 0, &docdesc); /*put alias on the list*/
  		
***************
*** 984,998 ****
  	if (errcode != noErr) /*shouldn't fail, but...*/
  		return (errcode);
- 	
- 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
- 		
- 		copydatahandle (&launchdesc, (Handle*) appparams);
  
! 	#else
! 	
! 		*appparams = (AppParametersHandle) launchdesc.dataHandle;
! 	
! 	#endif
  	
  	return (noErr);
  	} /*getlaunchappparams*/
--- 984,1001 ----
  	if (errcode != noErr) /*shouldn't fail, but...*/
  		return (errcode);
  
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 	copydatahandle (&launchdesc, (Handle*) appparams);
! #if AEDISPOSAL == 1
! 	// possible memleak here		
! #endif
  	
+ #else
+ 
+ 	*appparams = (AppParametersHandle) launchdesc.dataHandle;
+ 
+ #endif
+ 
  	return (noErr);
  	} /*getlaunchappparams*/

Index: langverbs.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langverbs.c,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -C2 -d -r1.12.2.2 -r1.12.2.3
*** langverbs.c	2 Feb 2006 18:39:59 -0000	1.12.2.2
--- langverbs.c	14 Feb 2006 11:43:57 -0000	1.12.2.3
***************
*** 931,939 ****
  		return (false);
  	
! 	#if !flruntime
  	
  	langunsettarget (htable, bs); /*make sure it's not still the target*/
  	
! 	#endif
  	
  	(*vreturned).data.flvalue = hashtabledelete (htable, bs);
--- 931,939 ----
  		return (false);
  	
! #if !flruntime
  	
  	langunsettarget (htable, bs); /*make sure it's not still the target*/
  	
! #endif
  	
  	(*vreturned).data.flvalue = hashtabledelete (htable, bs);
***************
*** 1869,1873 ****
  
  boolean langreleasesemaphores (hdlprocessrecord xxxhp) {
! 	
  	pushhashtable (semaphoretable); // for visit's hashdelete
  	
--- 1869,1873 ----
  
  boolean langreleasesemaphores (hdlprocessrecord xxxhp) {
! #pragma unused (xxxhp)
  	pushhashtable (semaphoretable); // for visit's hashdelete
  	

Index: langops.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langops.c,v
retrieving revision 1.4.6.2
retrieving revision 1.4.6.3
diff -C2 -d -r1.4.6.2 -r1.4.6.3
*** langops.c	2 Feb 2006 18:39:59 -0000	1.4.6.2
--- langops.c	14 Feb 2006 11:43:57 -0000	1.4.6.3
***************
*** 917,920 ****
--- 917,924 ----
  		case rgbvaluetype:
  		case objspecvaluetype:
+ #if LONGINT_LONGDATE == 1
+ 		case longlongintvaluetype:
+ 		case longdatetimevaluetype:
+ #endif
  		case aliasvaluetype:
  			x = gethandlesize (v.data.binaryvalue);

Index: about.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/about.c,v
retrieving revision 1.6.8.1
retrieving revision 1.6.8.2
diff -C2 -d -r1.6.8.1 -r1.6.8.2
*** about.c	2 Feb 2006 18:39:59 -0000	1.6.8.1
--- about.c	14 Feb 2006 11:43:57 -0000	1.6.8.2
***************
*** 889,895 ****
  //		return (false);
  	
! 	#ifdef WIN95VERSION
  	if (grabcount > 0)
! 	#endif
  	if (aboutport != nil && flhavemiscrect) {
  		//Code change by Timothy Paustian Monday, August 21, 2000 4:17:36 PM
--- 889,895 ----
  //		return (false);
  	
! #ifdef WIN95VERSION
  	if (grabcount > 0)
! #endif
  	if (aboutport != nil && flhavemiscrect) {
  		//Code change by Timothy Paustian Monday, August 21, 2000 4:17:36 PM
***************
*** 897,905 ****
  		//an implicit cast. This will not work on OS X
  		CGrafPtr	thePort;
! 		#if TARGET_API_MAC_CARBON == 1
  		thePort = GetWindowPort((WindowRef) aboutport);
! 		#else
  		thePort = (CGrafPtr)aboutport;		
! 		#endif
  		pushport(thePort);
  			
--- 897,905 ----
  		//an implicit cast. This will not work on OS X
  		CGrafPtr	thePort;
! #if TARGET_API_MAC_CARBON == 1
  		thePort = GetWindowPort((WindowRef) aboutport);
! #else
  		thePort = (CGrafPtr)aboutport;		
! #endif
  		pushport(thePort);
  			

Index: langipc.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langipc.c,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -C2 -d -r1.6.6.1 -r1.6.6.2
*** langipc.c	2 Feb 2006 18:39:59 -0000	1.6.6.1
--- langipc.c	14 Feb 2006 11:43:57 -0000	1.6.6.2
***************
*** 342,370 ****
  			
  			break;
! 		
! 	#ifdef oplanglists
  		case listvaluetype:
  		case recordvaluetype:
  			if (!langipcconvertoplist (v, &aelist))
  				return (false);
! 			
! 			#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			
! 				copydatahandle (&aelist, &hval);
! 				
! 			#else
! 			
! 				hval = aelist.dataHandle;
! 			
! 			#endif
! 			
  			disposevaluerecord (*v, false); /*override exempt, below*/
! 		
  			setnilvalue (v); /*clear out value*/
! 			
  			break;
! 	
! 	#endif
! 	
  		case addressvaluetype:	/*addresses need to be sent as strings for safety*/
  			getaddresspath (*v, bsval);
--- 342,372 ----
  			
  			break;
! 
! #ifdef oplanglists
  		case listvaluetype:
  		case recordvaluetype:
  			if (!langipcconvertoplist (v, &aelist))
  				return (false);
! 
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 			copydatahandle (&aelist, &hval);
! #if AEDISPOSAL == 1
! 	// possible memleak here		
! #endif
! #else
! 
! 			hval = aelist.dataHandle;
! 
! #endif
! 
  			disposevaluerecord (*v, false); /*override exempt, below*/
! 
  			setnilvalue (v); /*clear out value*/
! 
  			break;
! 
! #endif
! 
  		case addressvaluetype:	/*addresses need to be sent as strings for safety*/
  			getaddresspath (*v, bsval);
***************
*** 1641,1667 ****
  	
  	if (landgetverbattr (hverb, 'subj', typeFSS, &subject) == noErr) { /*4.1b7 dmb*/
! 		
! 		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 		
! 			FSSpec fs;
! 			
! 			Handle h;
! 			
! 			copydatahandle (&subject, &h);
! 			
! 			fs = **(FSSpec **) h;
! 			
! 			disposehandle (h);
! 		
! 		#else
! 		
! 			FSSpec fs = **(FSSpec **) subject.dataHandle;
! 		
! 		#endif
! 		
  		wroot = shellfindfilewindow (&fs);
! 		
  		if (wroot == nil) {
! 		
  			// landreturnerror 
  			}
--- 1643,1669 ----
  	
  	if (landgetverbattr (hverb, 'subj', typeFSS, &subject) == noErr) { /*4.1b7 dmb*/
! 
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 		FSSpec fs;
! 
! 		Handle h;
! 
! 		copydatahandle (&subject, &h);
! 
! 		fs = **(FSSpec **) h;
! 
! 		disposehandle (h);
! 
! #else
! 
! 		FSSpec fs = **(FSSpec **) subject.dataHandle;
! 
! #endif
! 
  		wroot = shellfindfilewindow (&fs);
! 
  		if (wroot == nil) {
! 
  			// landreturnerror 
  			}
***************
*** 2268,2300 ****
  		case listvaluetype:
  		case recordvaluetype:
! 			#ifdef version5orgreater
! 				return (langipcconvertoplist (&val, listdesc));
! 			#else
! 			
! 				#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 				
! 					{
! 					Handle hcopy;
! 					
! 					copydatahandle (listdesc, &hcopy);
! 					
! 					if (!stealbinaryhandle (&val, &hcopy))
! 						return (false);
! 						
! 					disposehandle (hcopy);
! 					}
! 				
! 				#else
! 				
! 					if (!stealbinaryhandle (&val, &(*listdesc).dataHandle))
! 						return (false);
! 								
! 				#endif
! 					
! 				(*listdesc).descriptorType = typeAERecord;
! 				
! 				return (true);
! 			#endif
! 		
  		case novaluetype:
  		case longvaluetype:
--- 2270,2295 ----
  		case listvaluetype:
  		case recordvaluetype:
! #ifdef version5orgreater
! 			return (langipcconvertoplist (&val, listdesc));
! #else
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			{
! 				Handle hcopy;
! 
! 				copydatahandle (listdesc, &hcopy);
! 
! 				if (!stealbinaryhandle (&val, &hcopy))
! 					return (false);
! 
! 				disposehandle (hcopy);
! 			}
! #else
! 			if (!stealbinaryhandle (&val, &(*listdesc).dataHandle))
! 				return (false);
! #endif
! 			(*listdesc).descriptorType = typeAERecord;
! 
! 			return (true);
! #endif
  		case novaluetype:
  		case longvaluetype:
***************
*** 2402,2408 ****
  	/*don't dispose itemdesc handle -- it's in the temp stack*/
  	
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 		{
  		Handle hcopy;
  		boolean fl = false;
--- 2397,2402 ----
  	/*don't dispose itemdesc handle -- it's in the temp stack*/
  	
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	{
  		Handle hcopy;
  		boolean fl = false;
***************
*** 2411,2414 ****
--- 2405,2411 ----
  		
  		fl = setbinarysymbolval (htable, bsname, hcopy, listdesc.descriptorType);
+ #if AEDISPOSAL == 1
+ 		// possible memleak here		
+ #endif
  		
  		//disposehandle (hcopy);
***************
*** 2416,2427 ****
  		if (!fl)
  			return (false);
! 		}
! 	
! 	#else
! 	
! 		if (!setbinarysymbolval (htable, bsname, listdesc.dataHandle, listdesc.descriptorType))
! 			return (false);
! 	
! 	#endif
  	
  	(*vreturned).data.flvalue = true;
--- 2413,2424 ----
  		if (!fl)
  			return (false);
! 	}
! 
! #else
! 
! 	if (!setbinarysymbolval (htable, bsname, listdesc.dataHandle, listdesc.descriptorType))
! 		return (false);
! 
! #endif
  	
  	(*vreturned).data.flvalue = true;
***************
*** 4265,4280 ****
  	AEDisposeDesc (&desc);
  	
! 	exit:
! 	
  	langipcunhookfasterrors ();
! 	
  	landpopfastcontext (&savecontext);
! 	
! 	#if flcomponent
! 		
! 		RestoreA5 (curA5);
! 	
! 	#endif
! 	
  	return (err);
  	} /*langipcfastgetobject*/
--- 4262,4277 ----
  	AEDisposeDesc (&desc);
  	
! exit:
! 
  	langipcunhookfasterrors ();
! 
  	landpopfastcontext (&savecontext);
! 
! #if flcomponent
! 
! 	RestoreA5 (curA5);
! 
! #endif
! 
  	return (err);
  	} /*langipcfastgetobject*/
***************
*** 4324,4327 ****
--- 4321,4327 ----
  		if (!setpackedobject (hcopy1, hcopy2))
  			goto exit;
+ #if AEDISPOSAL == 1
+ 		// possible memleak here		
+ #endif
  	}
  
***************
*** 4400,4419 ****
  		
  		setemptystring (bs);
! 		
! 		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 		
! 			{
  			Handle h;
! 			
  			copydatahandle (&script, &h);
  			
  			fl = langrunhandle (h, bs);
! 			}
! 		
! 		#else
! 		
! 			fl = langrunhandle (script.dataHandle, bs); /*consumes dataHandle*/
! 		
! 		#endif
  		
  		flscriptrunning = flscriptwasrunning;
--- 4400,4422 ----
  		
  		setemptystring (bs);
! 
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 		{
  			Handle h;
! 
  			copydatahandle (&script, &h);
+ #if AEDISPOSAL == 1
+ 			// possible memleak here		
+ #endif
  			
  			fl = langrunhandle (h, bs);
! 		}
! 
! #else
! 
! 		fl = langrunhandle (script.dataHandle, bs); /*consumes dataHandle*/
! 
! #endif
  		
  		flscriptrunning = flscriptwasrunning;
***************
*** 4434,4444 ****
  		landpopfastcontext (&savecontext);
  		
! 	#else /*this code assumes that the component manger is present*/
! 		
  		comp = OpenComponent (osacomponent);
! 		
  		if (comp == nil)
  			err = memFullErr;
- 		
  		else {
  			
--- 4437,4446 ----
  		landpopfastcontext (&savecontext);
  		
! #else /* this code assumes that the component manger is present */
! 
  		comp = OpenComponent (osacomponent);
! 
  		if (comp == nil)
  			err = memFullErr;
  		else {
  			
***************
*** 4462,4473 ****
  			}
  	
! 	#endif
! 	
! 	#if flcomponent && TARGET_API_MAC_OS8
! 		
  		RestoreA5 (curA5);
! 	
! 	#endif
! 	
  	return (err);
  	} /*langipchandlefastscript*/
--- 4464,4475 ----
  			}
  	
! #endif
! 
! #if flcomponent && TARGET_API_MAC_OS8
! 
  		RestoreA5 (curA5);
! 
! #endif
! 
  	return (err);
  	} /*langipchandlefastscript*/

Index: langsystypes.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langsystypes.c,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -d -r1.6.2.1 -r1.6.2.2
*** langsystypes.c	2 Feb 2006 18:39:59 -0000	1.6.2.1
--- langsystypes.c	14 Feb 2006 11:43:57 -0000	1.6.2.2
***************
*** 109,137 ****
  		}
  	else
! 	
! 		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 		
! 			{
! 			Handle hcopy1, hcopy2;
! 			boolean fl = false;
! 			
! 			copydatahandle (d1, &hcopy1);
! 			
! 			copydatahandle (d2, &hcopy2);
! 			
! 			fl = equalhandles (hcopy1, hcopy2);
! 			
! 			disposehandle (hcopy1);
! 			
! 			disposehandle (hcopy2);
! 			
! 			return (fl);
! 			}
! 				
! 		#else
! 		
! 			return (equalhandles ((*d1).dataHandle, (*d2).dataHandle));
! 		
! 		#endif
  	} /*equaldescriptors*/
  
--- 109,132 ----
  		}
  	else
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	{
! 		Handle hcopy1, hcopy2;
! 		boolean fl = false;
! 
! 		copydatahandle (d1, &hcopy1);
! 
! 		copydatahandle (d2, &hcopy2);
! 
! 		fl = equalhandles (hcopy1, hcopy2);
! 
! 		disposehandle (hcopy1);
! 
! 		disposehandle (hcopy2);
! 
! 		return (fl);
! 	}
! #else
! 	return (equalhandles ((*d1).dataHandle, (*d2).dataHandle));
! #endif
  	} /*equaldescriptors*/
  
***************
*** 1446,1467 ****
  	disposevaluerecord (*v, true);
  	
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 		{
  		Handle h;
! 		
  		copydatahandle (&token, &h);
! 		
  		if (!setheapvalue (h, stringvaluetype, v))
  			return (false);
! 		}
! 	
! 	#else
! 	
! 		if (!setheapvalue (token.dataHandle, stringvaluetype, v)) /*consumes handle*/
! 			return (false);
! 			
! 	#endif
! 	
  	return (stringtoaddress (v));
  	} /*objspectoaddress*/
--- 1441,1460 ----
  	disposevaluerecord (*v, true);
  	
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	{
  		Handle h;
! 
  		copydatahandle (&token, &h);
! #if AEDISPOSAL == 1
! 		// possible memleak here		
! #endif
  		if (!setheapvalue (h, stringvaluetype, v))
  			return (false);
! 	}
! #else
! 	if (!setheapvalue (token.dataHandle, stringvaluetype, v)) /*consumes handle*/
! 		return (false);
! #endif
! 
  	return (stringtoaddress (v));
  	} /*objspectoaddress*/
***************
*** 1539,1559 ****
  	
  	disposevaluerecord (*v, true);
! 	
! 	
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 		{
  		Handle h;
! 		
  		copydatahandle (&objdesc, &h);
! 		
  		return (setheapvalue (h, objspecvaluetype, v));
! 		}
! 	
! 	#else
! 	
! 		return (setheapvalue (objdesc.dataHandle, objspecvaluetype, v));
! 	
! 	#endif
  	
  	} /*filespectoobjspec*/
--- 1532,1549 ----
  	
  	disposevaluerecord (*v, true);
! 
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	{
  		Handle h;
! 
  		copydatahandle (&objdesc, &h);
! #if AEDISPOSAL == 1
! 		// possible memleak here		
! #endif
  		return (setheapvalue (h, objspecvaluetype, v));
! 	}
! #else
! 	return (setheapvalue (objdesc.dataHandle, objspecvaluetype, v));
! #endif
  	
  	} /*filespectoobjspec*/
***************
*** 1824,1845 ****
  				goto exit;
  			
! 			#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			
! 				{
  				Handle hcopy;
! 				
  				copydatahandle (&desc, &hcopy);
! 				
  				op = **(OSType **)hcopy;
! 				
  				disposehandle (hcopy);
! 				}
  
- 			#else
- 			
- 				op = **(OSType **)desc.dataHandle;
- 			
- 			#endif
- 			
  			operatortostring (op, bsop);
  			
--- 1814,1831 ----
  				goto exit;
  			
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			{
  				Handle hcopy;
! 
  				copydatahandle (&desc, &hcopy);
! 
  				op = **(OSType **)hcopy;
! 
  				disposehandle (hcopy);
! 			}
! #else
! 			op = **(OSType **)desc.dataHandle;
! #endif
  
  			operatortostring (op, bsop);
  			
***************
*** 1892,1900 ****
  			if (!getobjspeckeydesc (testdata, keyAECompOperator, &desc))
  				goto exit;
! 			
! 			
! 				#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			
! 				{
  				Handle hcopy;
  				
--- 1878,1884 ----
  			if (!getobjspeckeydesc (testdata, keyAECompOperator, &desc))
  				goto exit;
! 
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			{
  				Handle hcopy;
  				
***************
*** 1904,1914 ****
  				
  				disposehandle (hcopy);
! 				}
! 
! 				#else
! 			
! 					op = **(OSType **)desc.dataHandle;
! 			
! 				#endif
  
  			operatortostring (op, bsop);
--- 1888,1895 ----
  				
  				disposehandle (hcopy);
! 			}
! #else
! 			op = **(OSType **)desc.dataHandle;
! #endif
  
  			operatortostring (op, bsop);
***************
*** 2400,2420 ****
  				return (false);
  			
! 			#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			
! 				{
  				Handle h;
! 				
  				copydatahandle (&objectdesc, &h);
  				
  				return (setheapvalue (h, objspecvaluetype, v));
! 				}			
! 			
! 			#else
! 			
! 				return (setheapvalue (objectdesc.dataHandle, objspecvaluetype, v));
! 			
! 			#endif
! 		} /*switch*/
! 	} /*coercetoobjspec*/
  
  
--- 2381,2400 ----
  				return (false);
  			
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			{
  				Handle h;
! 
  				copydatahandle (&objectdesc, &h);
+ #if AEDISPOSAL == 1
+ 				// possible memleak here		
+ #endif
  				
  				return (setheapvalue (h, objspecvaluetype, v));
! 			}
! #else
! 			return (setheapvalue (objectdesc.dataHandle, objspecvaluetype, v));
! #endif
! 	} /*switch*/
! } /*coercetoobjspec*/
  
  
***************
*** 2443,2452 ****
  	
  	
! 	#ifdef flsystem6
  	
  	if (!langcanuseappleevents ())
  		return (false);
  	
! 	#endif
  	
  	if (!getostypevalue (hparam1, 1, &class))
--- 2423,2432 ----
  	
  	
! #ifdef flsystem6
  	
  	if (!langcanuseappleevents ())
  		return (false);
  	
! #endif
  	
  	if (!getostypevalue (hparam1, 1, &class))
***************
*** 2510,2529 ****
  		return (false);
  
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 		{
  		Handle h;
! 		
  		copydatahandle (&objspecdesc, &h);
! 		
  		return (setheapvalue (h, objspecvaluetype, val));
! 		}			
! 
! 	#else
! 
! 		return (setheapvalue (objspecdesc.dataHandle, objspecvaluetype, val));
! 	
! 	#endif
! 	} /*setobjspecverb*/
  
  
--- 2490,2507 ----
  		return (false);
  
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	{
  		Handle h;
! 
  		copydatahandle (&objspecdesc, &h);
! #if AEDISPOSAL == 1
! 		// possible memleak here		
! #endif
  		return (setheapvalue (h, objspecvaluetype, val));
! 	}			
! #else
! 	return (setheapvalue (objspecdesc.dataHandle, objspecvaluetype, val));
! #endif
! } /*setobjspecverb*/
  
  
***************
*** 2563,2571 ****
  	boolean fltmp = false;
  	
! 	#if TARGET_API_MAC_CARBON == 1
! 	
! 		Handle hcopy;
! 		
! 	#endif
  	
  	assert (h != nil);
--- 2541,2547 ----
  	boolean fltmp = false;
  	
! #if TARGET_API_MAC_CARBON == 1
! 	Handle hcopy;
! #endif
  	
  	assert (h != nil);
***************
*** 2591,2606 ****
  			if (!evaluateobject ((**h).param1, nulltype, &containerdesc)) /*daisy-chain recursion*/
  				return (false);
! 			
! 			#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			
! 				copydatahandle (&containerdesc, &hcopy);
! 				
! 				pushtmpstack (hcopy);
! 						
! 			#else
! 			
! 				pushtmpstack (containerdesc.dataHandle); /*until it's merged*/
! 			
! 			#endif
  			
  			fltmp = true;
--- 2567,2580 ----
  			if (!evaluateobject ((**h).param1, nulltype, &containerdesc)) /*daisy-chain recursion*/
  				return (false);
! 
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 			copydatahandle (&containerdesc, &hcopy);
! 
! 			pushtmpstack (hcopy);
! 
! #else
! 			pushtmpstack (containerdesc.dataHandle); /*until it's merged*/
! #endif
  			
  			fltmp = true;
***************
*** 2761,2786 ****
  	AEDesc valdesc;
  	OSErr errcode;
! 	
! 	#if TARGET_API_MAC_CARBON == 1
! 	
! 		Handle hcopy;
! 	
! 	#endif
! 	
  	if (!evaluateobject ((**h).param1, typeObjectBeingExamined, &objectdesc))
  		return (false);
! 	
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 		copydatahandle (&objectdesc, &hcopy);
! 		
! 		pushtmpstack (hcopy);
! 	
! 	#else
! 	
! 		pushtmpstack (objectdesc.dataHandle); /*until it's merged*/
! 	
! 	#endif
! 	
  	if (!evaluatetree ((**h).param2, &val))
  		return (false);
--- 2735,2756 ----
  	AEDesc valdesc;
  	OSErr errcode;
! 
! #if TARGET_API_MAC_CARBON == 1
! 	Handle hcopy;
! #endif
! 
  	if (!evaluateobject ((**h).param1, typeObjectBeingExamined, &objectdesc))
  		return (false);
! 
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	copydatahandle (&objectdesc, &hcopy);
! #if AEDISPOSAL == 1
! 	// possible memleak here		
! #endif
! 	pushtmpstack (hcopy);
! #else
! 	pushtmpstack (objectdesc.dataHandle); /*until it's merged*/
! #endif
! 
  	if (!evaluatetree ((**h).param2, &val))
  		return (false);
***************
*** 3011,3021 ****
  	OSErr errcode;
  	boolean fltmp = false;
! 	
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 		Handle hcopy;
! 	
! 	#endif
! 	
  	assert (h != nil);
  	
--- 2981,2989 ----
  	OSErr errcode;
  	boolean fltmp = false;
! 
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	Handle hcopy;
! #endif
! 
  	assert (h != nil);
  	
***************
*** 3044,3059 ****
  			if (!evaluateobject ((**hp1).param1, nulltype, &containerdesc)) /*daisy-chain recursion*/
  				return (false);
! 			
! 			#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			
! 				copydatahandle (&containerdesc, &hcopy);
! 				
! 				pushtmpstack (hcopy);
! 			
! 			#else
! 			
! 				pushtmpstack (containerdesc.dataHandle); /*until it's merged*/
! 			
! 			#endif
  			
  			fltmp = true;
--- 3012,3026 ----
  			if (!evaluateobject ((**hp1).param1, nulltype, &containerdesc)) /*daisy-chain recursion*/
  				return (false);
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			copydatahandle (&containerdesc, &hcopy);
! 
! 			pushtmpstack (hcopy);
! 
! #if AEDISPOSAL == 1
! 			// possible memleak here		
! #endif
! #else
! 			pushtmpstack (containerdesc.dataHandle); /*until it's merged*/
! #endif
  			
  			fltmp = true;
***************
*** 3068,3082 ****
  				return (false);
  
! 			#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			
! 				copydatahandle (&containerdesc, &hcopy);
! 				
! 				pushtmpstack (hcopy);
! 			
! 			#else
! 			
! 				pushtmpstack (containerdesc.dataHandle); /*until it's merged*/
! 				
! 			#endif
  			
  			fltmp = true;
--- 3035,3048 ----
  				return (false);
  
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			copydatahandle (&containerdesc, &hcopy);
! 
! 			pushtmpstack (hcopy);
! #if AEDISPOSAL == 1
! 			// possible memleak here		
! #endif
! #else
! 			pushtmpstack (containerdesc.dataHandle); /*until it's merged*/
! #endif
  			
  			fltmp = true;
***************
*** 3228,3252 ****
  
  boolean evaluateobjspec (hdltreenode htree, tyvaluerecord *vreturned) {
! 	
  	AEDesc objectdesc;
! 	
  	if (!evaluateobject (htree, typeNull, &objectdesc))
  		return (false);
! 	
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 		{
  		Handle h;
! 		
  		copydatahandle (&objectdesc, &h);
  		
  		return (setheapvalue (h, objspecvaluetype, vreturned));
! 		}
! 	
! 	#else
! 	
! 		return (setheapvalue (objectdesc.dataHandle, objspecvaluetype, vreturned));
! 
! 	#endif
  	} /*evaluateobjspec*/
  
--- 3194,3217 ----
  
  boolean evaluateobjspec (hdltreenode htree, tyvaluerecord *vreturned) {
! 
  	AEDesc objectdesc;
! 
  	if (!evaluateobject (htree, typeNull, &objectdesc))
  		return (false);
! 
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	{
  		Handle h;
! 
  		copydatahandle (&objectdesc, &h);
+ #if AEDISPOSAL == 1
+ 		// possible memleak here		
+ #endif
  		
  		return (setheapvalue (h, objspecvaluetype, vreturned));
! 	}
! #else
! 	return (setheapvalue (objectdesc.dataHandle, objspecvaluetype, vreturned));
! #endif
  	} /*evaluateobjspec*/
  

Index: timedate.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/timedate.c,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -C2 -d -r1.10 -r1.10.4.1
*** timedate.c	16 Jan 2005 00:30:19 -0000	1.10
--- timedate.c	14 Feb 2006 11:43:57 -0000	1.10.4.1
***************
*** 671,742 ****
  	*/
  	
! 	#ifdef MACVERSION
  
! 		Ptr p = (Ptr) bsdate + 1;
! 		long n = stringlength (bsdate);
! 		long used = 0;
! 		DateCacheRecord cache;
! 		LongDateRec longdate;
! 		boolean flgotdate;
! 		boolean flgottime;
! 		DateTimeRec shortdate;
! 		boolean flUseGMT = false;
! 		long index;
! 		
! 		index = stringlength (bsdate);
  
! 		while (getstringcharacter(bsdate, index-1) == ' ')
! 			--index;
  
! 		if (index > 3) {
! 			if ((getstringcharacter(bsdate, index - 3) == 'G') && (getstringcharacter(bsdate, index - 2) == 'M') && (getstringcharacter(bsdate, index -1) == 'T')) {
! 				flUseGMT = true;
! 				}
! 			}
  
! 		*time = 0; /*default return value*/
! 		
! 		clearbytes (&longdate, sizeof (longdate));
! 		
! 		if (InitDateCache (&cache) != noErr) /*must do this before calling StringToDate*/
! 			return (false);
! 		
! 		flgotdate = ((StringToDate (p, n, &cache, &used, &longdate) & fatalDateTime) == 0);
! 		
! 		flgottime = ((StringToTime (p + used, n - used, &cache, &used, &longdate) & fatalDateTime) == 0);
! 		
! 		if (!flgotdate && !flgottime) /*nuthin' doin'*/
! 			return (false);
! 		
! 		if (flgotdate) {
! 		
! 			shortdate.day = longdate.ld.day;
! 			
! 			shortdate.month = longdate.ld.month;
! 			
! 			shortdate.year = longdate.ld.year;
! 			}
! 		else {
! 			
! 			SecondsToDate (0, &shortdate);
! 			
! 			/*
! 			GetTime (&shortdate);
! 			*/
! 			}
! 		
! 		shortdate.hour = longdate.ld.hour; /*time fields will be zero if !flgottime*/
! 		
! 		shortdate.minute = longdate.ld.minute;
! 		
! 		shortdate.second = longdate.ld.second;
! 		
! 		DateToSeconds (&shortdate, time);
  
! 		if (flUseGMT) {
! 			adjustforcurrenttimezone (time);
! 			}
! 		
! 	#endif
  
  	#ifdef WIN95VERSION
--- 671,742 ----
  	*/
  	
! #ifdef MACVERSION
  
! 	Ptr p = (Ptr) bsdate + 1;
! 	long n = stringlength (bsdate);
! 	long used = 0;
! 	DateCacheRecord cache;
! 	LongDateRec longdate;
! 	boolean flgotdate;
! 	boolean flgottime;
! 	DateTimeRec shortdate;
! 	boolean flUseGMT = false;
! 	long index;
  
! 	index = stringlength (bsdate);
  
! 	while (getstringcharacter(bsdate, index-1) == ' ')
! 		--index;
  
! 	if (index > 3) {
! 		if ((getstringcharacter(bsdate, index - 3) == 'G') && (getstringcharacter(bsdate, index - 2) == 'M') && (getstringcharacter(bsdate, index -1) == 'T')) {
! 			flUseGMT = true;
! 		}
! 	}
  
! 	*time = 0; /*default return value*/
! 
! 	clearbytes (&longdate, sizeof (longdate));
! 
! 	if (InitDateCache (&cache) != noErr) /*must do this before calling StringToDate*/
! 		return (false);
! 
! 	flgotdate = ((StringToDate (p, n, &cache, &used, &longdate) & fatalDateTime) == 0);
! 
! 	flgottime = ((StringToTime (p + used, n - used, &cache, &used, &longdate) & fatalDateTime) == 0);
! 
! 	if (!flgotdate && !flgottime) /*nuthin' doin'*/
! 		return (false);
! 
! 	if (flgotdate) {
! 
! 		shortdate.day = longdate.ld.day;
! 
! 		shortdate.month = longdate.ld.month;
! 
! 		shortdate.year = longdate.ld.year;
! 	}
! 	else {
! 
! 		SecondsToDate (0, &shortdate);
! 
! 		/*
! 		 GetTime (&shortdate);
! 		 */
! 	}
! 
! 	shortdate.hour = longdate.ld.hour; /*time fields will be zero if !flgottime*/
! 
! 	shortdate.minute = longdate.ld.minute;
! 
! 	shortdate.second = longdate.ld.second;
! 
! 	DateToSeconds (&shortdate, time);
! 
! 	if (flUseGMT) {
! 		adjustforcurrenttimezone (time);
! 	}
! 
! #endif
  
  	#ifdef WIN95VERSION

Index: langvalue.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langvalue.c,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -d -r1.8.2.2 -r1.8.2.3
*** langvalue.c	2 Feb 2006 18:39:59 -0000	1.8.2.2
--- langvalue.c	14 Feb 2006 11:43:57 -0000	1.8.2.3
***************
*** 1783,1788 ****
  
  
! static boolean binarytoscalar (tyvaluerecord *val, tyvaluetype type) {
! 	
  	/*
  	5.0a22 dmb: handle any-endian
--- 1783,1789 ----
  
  
! static boolean
! binarytoscalar (tyvaluerecord *val, tyvaluetype type)
! {
  	/*
  	5.0a22 dmb: handle any-endian
***************
*** 2122,2126 ****
  			
  			break;
! 		
  		case directionvaluetype:
  			x = (long) (*v).data.dirvalue;
--- 2123,2127 ----
  			
  			break;
! 
  		case directionvaluetype:
  			x = (long) (*v).data.dirvalue;
***************
*** 2148,2152 ****
  			break;
  #endif
! 			
  		case singlevaluetype:
  			f = (*v).data.singlevalue;
--- 2149,2153 ----
  			break;
  #endif
! 
  		case singlevaluetype:
  			f = (*v).data.singlevalue;
***************
*** 2168,2172 ****
  			
  			break;
! 		
  		case binaryvaluetype: {
  			long n;
--- 2169,2180 ----
  			
  			break;
! 
! #if LONGINT_LONGDATE == 1
! 		case longlongintvaluetype:
! 			// a quick & dirty hack just to have sth.
! 			
! 		case longdatetimevaluetype:
! 			break;
! #endif
  		case binaryvaluetype: {
  			long n;
***************
*** 2213,2218 ****
  		case longvaluetype:
  			// kwtodo - 2006-01-30
! 			return (true);
! 			
  		case novaluetype:
  			if (flinhibitnilcoercion)
--- 2221,2227 ----
  		case longvaluetype:
  			// kwtodo - 2006-01-30
! 			x = (tylonglongint)(*v).data.longvalue;
! 			break;
! 
  		case novaluetype:
  			if (flinhibitnilcoercion)
***************
*** 2309,2315 ****
  			return (false);
  	} /*switch*/
! 	
! 	return (setlongvalue (x, v));
  } /* coercetolong */
  #endif
  
--- 2318,2426 ----
  			return (false);
  	} /*switch*/
! 
! 	{
! 		Handle llv;
! 
! 		if (!newhandle(sizeof(tylonglongint), &llv))
! 			return (false);
! 
! 		if (!sethandlecontents(&x, sizeof(tylonglongint), llv))
! 			return (false);
! 		return (setlonglongintvalue (llv, v));
! 	}
! 	return(true);	// have a happy compiler
  } /* coercetolong */
+ 
+ 
+ static boolean
+ coercetolongdate (tyvaluerecord *v)
+ {
+ 	// kw - 2006-02-12 --- modeled after coercetodate
+ 
+ 	tylonglongint x;
+ 
+ 	switch ((*v).valuetype) {
+ 
+ 		case datevaluetype:
+ 		{
+ 			// kwtodo: check bounds
+ 			return (true);
+ 		}
+ 			
+ 		case novaluetype: {
+ 			if (flinhibitnilcoercion)
+ 				return (false);
+ 
+ 			// kwtodo: 
+ 			x = timenow ();
+ 			
+ 			break;
+ 		}
+ 			
+ 		case longvaluetype:
+ 		case ostypevaluetype:
+ 			x = (tylonglongint)(*v).data.longvalue;
+ 			
+ 			break;
+ 			
+ 		case charvaluetype:
+ 			x = (tylonglongint) (*v).data.chvalue;
+ 			
+ 			break;
+ 			
+ 		case booleanvaluetype:
+ 			x = (tylonglongint) (*v).data.flvalue;
+ 			
+ 			break;
+ 			
+ 		case intvaluetype:
+ 			x = (tylonglongint) (*v).data.intvalue;
+ 			
+ 			break;
+ 			
+ 		case directionvaluetype:
+ 			x = (tylonglongint) (*v).data.dirvalue;
+ 			
+ 			break;
+ 			
+ 		case stringvaluetype: {
+ 			bigstring bs;
+ 			unsigned long ltime;	// kw - 2006-02-02 renamed due to shadow warning
+ 			
+ 			pullstringvalue (v, bs);
+ 			
+ 			if (!stringtotime (bs, &ltime)) {
+ 				
+ 				langerror (datecoerceerror);
+ 				
+ 				return (false);
+ 			}
+ 			
+ 			x = ltime;
+ 			
+ 			break;
+ 		}
+ 			
+ 		case binaryvaluetype:
+ 			return (binarytoscalar (v, datevaluetype));
+ 			
+ 		case listvaluetype:
+ 		case recordvaluetype:
+ 			return (coercelistvalue (v, datevaluetype));
+ 			
+ 		default:
+ 			langerror (datecoerceerror);
+ 			
+ 			return (false);
+ 	} /*switch*/
+ 	
+ 	setdatevalue (x, v);
+ 	
+ 	return (true);
+ } /*coercetodate*/
+ 
+ 
+ 
+ 
  #endif
  
***************
*** 3694,3698 ****
  		case longvaluetype:
  			return (coercetolong (v));
! 		
  		case directionvaluetype:
  			return (coercetodirection (v));
--- 3805,3816 ----
  		case longvaluetype:
  			return (coercetolong (v));
! 
! #if LONGINT_LONGDATE == 1
! 		case longlongintvaluetype:
! 			return (coercetolonglong(v));
! 
! 		case longdatetimevaluetype:
! 			return (coercetolongdate(v));
! #endif
  		case directionvaluetype:
  			return (coercetodirection (v));
***************
*** 4954,4959 ****
  	return (coercetolong (v));
  	} /*getlongparam*/
! 	
! 	
  boolean getdateparam (hdltreenode hfirst, short pnum, tyvaluerecord *v) {
  	
--- 5072,5091 ----
  	return (coercetolong (v));
  	} /*getlongparam*/
! 
! 
! #if LONGINT_LONGDATE == 1
! boolean
! getlonglongintparam(
! 		hdltreenode		 hfirst,
! 		short			 pnum,
! 		tyvaluerecord	*v)
! {
! 	if (!getparamvalue (hfirst, pnum, v))
! 		return (false);
! 	return(coercetolonglong(v));
! }
! #endif
! 
! 
  boolean getdateparam (hdltreenode hfirst, short pnum, tyvaluerecord *v) {
  	
***************
*** 5275,5278 ****
--- 5407,5428 ----
  	} /*getlongvalue*/
  
+ #if LONGINT_LONGDATE == 1
+ boolean
+ getlonglongintvalue (
+ 		hdltreenode		 hfirst,
+ 		short			 pnum,
+ 		tylonglongint	*lval)
+ {
+ 	tyvaluerecord val;
+ 
+ 	if (!getlonglongintparam (hfirst, pnum, &val)) 
+ 		return (false);
+ 
+ 	*lval = val.data.longvalue;
+ 
+ 	return (true);
+ } /* getlonglongintvalue */
+ #endif
+ 
  
  boolean getdirectionvalue (hdltreenode hfirst, short pnum, tydirection *dirval) {
***************
*** 6078,6083 ****
  
  
! static boolean assignordeletevalue (register hdltreenode hlhs, tyvaluerecord *vassign, tytreetype op, tyvaluerecord *vold, tyvaluerecord *vnew) {
! 	
  	/*
  	2.1b2 dmb: common code; delete item if vassign is nil
--- 6228,6239 ----
  
  
! static boolean
! assignordeletevalue (
! 		register hdltreenode	 hlhs,
! 		tyvaluerecord			*vassign,
! 		tytreetype				 op,
! 		tyvaluerecord			*vold,
! 		tyvaluerecord			*vnew)
! {
  	/*
  	2.1b2 dmb: common code; delete item if vassign is nil

Index: osacomponent.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osacomponent.c,v
retrieving revision 1.7.6.1
retrieving revision 1.7.6.2
diff -C2 -d -r1.7.6.1 -r1.7.6.2
*** osacomponent.c	31 Jan 2006 16:43:31 -0000	1.7.6.1
--- osacomponent.c	14 Feb 2006 11:43:57 -0000	1.7.6.2
***************
*** 2485,2496 ****
  	hdlhashnode hnodesource;
  	hdlhashnode hnodecode;
! 	
! 	#if TARGET_API_MAC_CARBON == 1
! 		if (!copydatahandle ((AEDesc*)scriptData, &descData))	/* AE OS X fix */
! 			return (memFullErr);
! 	#else
! 		descData = scriptData->dataHandle;
! 	#endif
! 	
  	switch (scriptData->descriptorType) {
  		
--- 2485,2496 ----
  	hdlhashnode hnodesource;
  	hdlhashnode hnodecode;
! 
! #if TARGET_API_MAC_CARBON == 1
! 	if (!copydatahandle ((AEDesc*)scriptData, &descData))	/* AE OS X fix */
! 		return (memFullErr);
! #else
! 	descData = scriptData->dataHandle;
! #endif
! 
  	switch (scriptData->descriptorType) {
  		
***************
*** 2999,3015 ****
  		
  		flkeepsource = true;
! 		
! 		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 			
! 			if (!copydatahandle ((AEDesc*) sourceData, &htext)) /*make copy for eventual getsource*/
! 				return (memFullErr);		
! 		
! 		#else
! 		
! 			if (!copyhandle ((*sourceData).dataHandle, &htext)) /*make copy for eventual getsource*/
! 				return (memFullErr);
! 		
! 		#endif
! 		
  		if (!setheapvalue (htext, stringvaluetype, &vsource))
  			return (osageterror ());
--- 2999,3011 ----
  		
  		flkeepsource = true;
! 
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 		if (!copydatahandle ((AEDesc*) sourceData, &htext)) /*make copy for eventual getsource*/
! 			return (memFullErr);		
! #else
! 		if (!copyhandle ((*sourceData).dataHandle, &htext)) /*make copy for eventual getsource*/
! 			return (memFullErr);
! #endif
! 
  		if (!setheapvalue (htext, stringvaluetype, &vsource))
  			return (osageterror ());
***************
*** 5439,5455 ****
  		return (false);
  	
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 		{
  		Handle h;
! 		
  		copydatahandle (&scriptsource, &h);
! 		
  		AEDisposeDesc (&scriptsource);	/* 2004-10-28 aradke: we're done with it */
! 		
  		return (setheapvalue (h, stringvaluetype, vsource));
! 		}
! 	#else
! 		return (setheapvalue (scriptsource.dataHandle, stringvaluetype, vsource));
! 	#endif
  	} /*osagetsource*/
  
--- 5435,5451 ----
  		return (false);
  	
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	{
  		Handle h;
! 
  		copydatahandle (&scriptsource, &h);
! 
  		AEDisposeDesc (&scriptsource);	/* 2004-10-28 aradke: we're done with it */
! 
  		return (setheapvalue (h, stringvaluetype, vsource));
! 	}
! #else
! 	return (setheapvalue (scriptsource.dataHandle, stringvaluetype, vsource));
! #endif
  	} /*osagetsource*/
  

Index: memory.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/memory.c,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -C2 -d -r1.6.4.1 -r1.6.4.2
*** memory.c	2 Feb 2006 18:39:59 -0000	1.6.4.1
--- memory.c	14 Feb 2006 11:43:57 -0000	1.6.4.2
***************
*** 444,465 ****
  	
  	if (h != nil) {
! 		
! 	#ifdef WIN95VERSION
  		DisposeHandle (h);
! 	#endif
  
! 	#ifdef MACVERSION
! 		#if (MEMTRACKER == 1)
! 			debugremovememhandle(h);
! 		#endif
  
! 		#ifdef fldebug
  		//Code change by Timothy Paustian Friday, June 9, 2000 9:43:15 PM
  		//No temp memory in Carbon
! 		#if TARGET_API_MAC_CARBON == 0
  		if (HandleZone (h) == tempzone)
  			--cttemphandles;
! 		#endif
! 		#endif
  		
  		DisposeHandle (h);
--- 444,465 ----
  	
  	if (h != nil) {
! #ifdef WIN95VERSION
  		DisposeHandle (h);
! #endif
  
! #ifdef MACVERSION
! #	if (MEMTRACKER == 1)
! 		debugremovememhandle(h);
! #	endif
  
! #	ifdef fldebug
  		//Code change by Timothy Paustian Friday, June 9, 2000 9:43:15 PM
  		//No temp memory in Carbon
! #		if TARGET_API_MAC_CARBON == 0
  		if (HandleZone (h) == tempzone)
  			--cttemphandles;
! 
! #		endif
! #	endif
  		
  		DisposeHandle (h);
***************
*** 467,479 ****
  		//disposed of handles should always be set to nil
  		h = nil;
! 		#ifdef fldebug
  		
  		if (MemError ())
  			 memoryerror ();
  		
! 		#endif
! 	#endif		
! 		}
! 	} /*disposehandle*/
  
  
--- 467,479 ----
  		//disposed of handles should always be set to nil
  		h = nil;
! #	ifdef fldebug
  		
  		if (MemError ())
  			 memoryerror ();
  		
! #	endif
! #endif		
! 	}
! } /*disposehandle*/
  
  
***************
*** 599,609 ****
  	
  	
! void fillchar (ptrvoid pfill, long ctfill, char chfill) {
! 	
  	/*
! 	do a mass memory fill -- copy ctfill chfills at pfill.
! 	*/
  	
  #ifdef MACVERSION
  	register ptrbyte p = pfill;
  	register long ct = ctfill;
--- 599,614 ----
  	
  	
! void
! fillchar (
! 		  ptrvoid pfill,
! 		  long ctfill,
! 		  char chfill)
! {
  	/*
! 	 do a mass memory fill -- copy ctfill chfills at pfill.
! 	 */
  	
  #ifdef MACVERSION
+ #	ifndef SPEED
  	register ptrbyte p = pfill;
  	register long ct = ctfill;
***************
*** 612,622 ****
  	while (--ct >= 0)
  		*p++ = (char) ch; /*tight loop*/
  #endif
! 
  #ifdef WIN95VERSION
  	FillMemory (pfill, ctfill, chfill);
  #endif
! 	} /*fillchar*/
! 	
  
  void clearbytes (ptrvoid pclear, long ctclear) {
--- 617,669 ----
  	while (--ct >= 0)
  		*p++ = (char) ch; /*tight loop*/
+ #	else
+ #		ifdef SPEEDDEBUG
+ 	static unsigned long
+ 		callTabCount = 0,
+ 		callZeroCount = 0,
+ 		callNonzeroCount = 0,
+ 		callZeroFills = 0,
+ 		callClosebraceFills = 0,
+ 		callOtherFills = 0,
+ 		callMedianSize = 0,
+ 		callSumCount;
+ 	
+ 	if (ctfill == 0)
+ 	{
+ 		callZeroCount++;
+ 	}
+ 	else
+ 	{
+ 		callNonzeroCount++;
+ 	}
+ 	
+ 	switch(chfill)
+ 	{
+ 		case 0x00:
+ 			callZeroFills++;
+ 			break;
+ 		case 0x09:
+ 			callTabCount++;
+ 			break;
+ 		case 0x7d:
+ 			callClosebraceFills++;
+ 			break;
+ 		default:
+ 			callOtherFills++;
+ 			break;
+ 	}
+ 	
+ 	callSumCount += ctfill;
+ 	callMedianSize = (callSumCount / (callZeroCount + callNonzeroCount));
+ #		endif
+ 	memset(pfill, chfill, ctfill);
+ 	
+ #	endif
  #endif
! 	
  #ifdef WIN95VERSION
  	FillMemory (pfill, ctfill, chfill);
  #endif
! } /*fillchar*/	
  
  void clearbytes (ptrvoid pclear, long ctclear) {

Index: langhtml.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langhtml.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** langhtml.c	19 Dec 2005 01:56:43 -0000	1.8
--- langhtml.c	14 Feb 2006 11:43:57 -0000	1.8.2.1
***************
*** 553,565 ****
  		goto error;
  	
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 		copydatahandle (&result, hresult);
! 		
! 	#else
! 	
! 		*hresult = result.dataHandle;
  	
! 	#endif
  	
  	return (true);
--- 553,568 ----
  		goto error;
  	
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 	copydatahandle (&result, hresult);
! #if AEDISPOSAL == 1
! 	// possible memleak here		
! #endif
  	
! #else
! 
! 	*hresult = result.dataHandle;
! 
! #endif
  	
  	return (true);
***************
*** 2847,2881 ****
  		
  		disposehandle (htext);
! 		
! 		#if TARGET_API_MAC_CARBON == 1
! 		
! 			{
  			Handle h;
! 			
  			copydatahandle (&list, &h);
! 			
  			return (setheapvalue (h, listvaluetype, vreturned));			
! 			}
! 		
! 		#else
! 		
! 			return (setheapvalue (list.dataHandle, listvaluetype, vreturned));
! 		
! 		#endif
! 		
! 		error: {
! 		
! 			disposehandle (hreturnedtext);
! 			
! 			disposehandle (htext);
! 			
! 			AEDisposeDesc (&list); // 5.0d12 dmb
  
! 			if (!fllangerror)
! 				oserror (IACglobals.errorcode);
  
! 			return (false);
! 			}
! 	#endif
  	} /*parseargsverb*/
  
--- 2850,2882 ----
  		
  		disposehandle (htext);
! 
! #if TARGET_API_MAC_CARBON == 1
! 		{
  			Handle h;
! 
  			copydatahandle (&list, &h);
! 
  			return (setheapvalue (h, listvaluetype, vreturned));			
! 		}
  
! #else
  
! 		return (setheapvalue (list.dataHandle, listvaluetype, vreturned));
! 
! #endif
! 
! error: {
! 	disposehandle (hreturnedtext);
! 
! 	disposehandle (htext);
! 
! 	AEDisposeDesc (&list); // 5.0d12 dmb
! 
! 	if (!fllangerror)
! 		oserror (IACglobals.errorcode);
! 
! 	return (false);
! }
! #endif
  	} /*parseargsverb*/
  

Index: fileloop.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/fileloop.c,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -C2 -d -r1.5.4.1 -r1.5.4.2
*** fileloop.c	2 Feb 2006 18:39:59 -0000	1.5.4.1
--- fileloop.c	14 Feb 2006 11:43:57 -0000	1.5.4.2
***************
*** 69,73 ****
  
  boolean diskinitloop (tyfileloopcallback diskfilter, Handle *hdiskloop) {
! 	
  	/*
  	same as fileinitloop, but for volumes on line
--- 69,73 ----
  
  boolean diskinitloop (tyfileloopcallback diskfilter, Handle *hdiskloop) {
! #pragma unused (diskfilter)
  	/*
  	same as fileinitloop, but for volumes on line
***************
*** 179,183 ****
  
  boolean fileinitloop (const tyfilespec *fs, tyfileloopcallback filefilter, Handle *hfileloop) {
! 	
  	/*
  	a conglomeration of filemanager incantations which sets up a UserLand
--- 179,183 ----
  
  boolean fileinitloop (const tyfilespec *fs, tyfileloopcallback filefilter, Handle *hfileloop) {
! #pragma unused (filefilter)	
  	/*
  	a conglomeration of filemanager incantations which sets up a UserLand

[frontierkernel-commits] Frontier/Common/headers frontierdefs.h,1.7.6.1,1.7.6.2,pre_int64_branch quickdraw.h,1.3,1.3.6.1,pre_int64_branch stringdefs.h,1.3.6.2,1.3.6.3,pre_int64_branch

[Karsten W. <kar...@us...>]

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

Modified Files:
      Tag: pre_int64_branch
	frontierdefs.h quickdraw.h stringdefs.h 
Log Message:
sint64 next changes

Index: stringdefs.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/stringdefs.h,v
retrieving revision 1.3.6.2
retrieving revision 1.3.6.3
diff -C2 -d -r1.3.6.2 -r1.3.6.3
*** stringdefs.h	2 Feb 2006 18:37:59 -0000	1.3.6.2
--- stringdefs.h	14 Feb 2006 11:40:04 -0000	1.3.6.3
***************
*** 76,81 ****
  
  	// kw - 2006-01-30 --- new types added
! 	#define STR_longlong	"\x09" "64bit-int"
! 	#define STR_longdate	"\x08" "longdate"
  
  	#define STR_with		"\x04" "with"
--- 76,81 ----
  
  	// kw - 2006-01-30 --- new types added
! 	#define STR_longlong	"\x06" "sint64"
! 	#define STR_longdate	"\x0c" "longdatetime"
  
  	#define STR_with		"\x04" "with"

Index: quickdraw.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/quickdraw.h,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -d -r1.3 -r1.3.6.1
*** quickdraw.h	11 Jan 2005 22:48:02 -0000	1.3
--- quickdraw.h	14 Feb 2006 11:40:04 -0000	1.3.6.1
***************
*** 75,78 ****
--- 75,85 ----
  extern short getmenubarheight (void);
  
+ // kw - make static
+ extern CGrafPtr getmacwindowport(WindowPtr);
+ extern CGrafPtr getmacqdglobaltheport(void);
+ extern Rect getwindowportrect(WindowPtr);
+ extern void invalmacwindowrect(WindowPtr, Rect);
+ 
+ 
  extern boolean pushpen (void);
  

Index: frontierdefs.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontierdefs.h,v
retrieving revision 1.7.6.1
retrieving revision 1.7.6.2
diff -C2 -d -r1.7.6.1 -r1.7.6.2
*** frontierdefs.h	31 Jan 2006 16:40:09 -0000	1.7.6.1
--- frontierdefs.h	14 Feb 2006 11:40:04 -0000	1.7.6.2
***************
*** 83,86 ****
--- 83,88 ----
  // kw 2006-01-27 --- make new data types
  #define LONGINT_LONGDATE 1
+ // kw - 2006-02-13 --- a test for the AE-memory leak
+ #define AEDISPOSAL 1
  
  #ifdef MACVERSION

[frontierkernel-commits] Frontier/Common/UserLandIACToolkit landgetparam.c,1.3,1.3.6.1,pre_int64_branch

[Karsten W. <kar...@us...>]

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

Modified Files:
      Tag: pre_int64_branch
	landgetparam.c 
Log Message:
compiler warning fixes

Index: landgetparam.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landgetparam.c,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -d -r1.3 -r1.3.6.1
*** landgetparam.c	11 Jan 2005 22:47:59 -0000	1.3
--- landgetparam.c	14 Feb 2006 11:37:40 -0000	1.3.6.1
***************
*** 112,132 ****
  		return (false);
  	
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 		{		
  		Handle h;
! 		
  		copydatahandle (&(param.desc), &h);
! 		
  		*x = **(short **) h;
! 		
  		disposehandle (h);
! 		}
! 	
! 	#else
! 		
! 		*x = **(short **) param.desc.dataHandle;
! 	
! 	#endif
  	
  	landdisposeparamrecord (&param);
--- 112,131 ----
  		return (false);
  	
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	{		
  		Handle h;
! 
  		copydatahandle (&(param.desc), &h);
! 
  		*x = **(short **) h;
! 
  		disposehandle (h);
! 	}
! 
! #else
! 
! 	*x = **(short **) param.desc.dataHandle;
! 
! #endif
  	
  	landdisposeparamrecord (&param);
***************
*** 143,162 ****
  		return (false);
  
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 		{		
  		Handle h;
! 		
  		copydatahandle (&(param.desc), &h);
! 		
  		*x = **(long **) h;
! 		}
! 	
! 	#else
! 	
! 		*x = **(long **) param.desc.dataHandle;
! 	
! 	#endif
! 	
  	landdisposeparamrecord (&param);
  	
--- 142,160 ----
  		return (false);
  
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	{		
  		Handle h;
! 
  		copydatahandle (&(param.desc), &h);
! 
  		*x = **(long **) h;
! 	}
! 
! #else
! 
! 	*x = **(long **) param.desc.dataHandle;
! 
! #endif
! 
  	landdisposeparamrecord (&param);
  	
***************
*** 199,211 ****
  		return (false);
  
! 	#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 		 copydatahandle (&(param.desc), x);
! 	
! 	#else
! 		
! 		*x = param.desc.dataHandle;
! 	
! 	#endif
  
  	return (true);
--- 197,211 ----
  		return (false);
  
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 	copydatahandle (&(param.desc), x);
! #if AEDISPOSAL == 1
! 	// possible memleak here		
! #endif
! #else
! 
! 	*x = param.desc.dataHandle;
! 
! #endif
  
  	return (true);

[frontierkernel-commits] Frontier/Common/IowaRuntime/Headers iowaruntime.h,1.2,1.2.6.1,pre_int64_branch

[Karsten W. <kar...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22236/Headers

Modified Files:
      Tag: pre_int64_branch
	iowaruntime.h 
Log Message:
compiler warning fixes

Index: iowaruntime.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Headers/iowaruntime.h,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -C2 -d -r1.2 -r1.2.6.1
*** iowaruntime.h	11 Jan 2005 22:47:39 -0000	1.2
--- iowaruntime.h	14 Feb 2006 11:35:56 -0000	1.2.6.1
***************
*** 113,117 ****
  boolean runCard (Handle, boolean, short, short, tycardeventcallback);
  
! boolean runHostedCard (WindowPtr hostwindow, Handle hpackedcard, boolean flscriptedcard, tycardeventcallback callback);
  
  boolean setObjectValue (hdlcard, bigstring, Handle);
--- 113,117 ----
  boolean runCard (Handle, boolean, short, short, tycardeventcallback);
  
! boolean runHostedCard (WindowPtr hostwindow, Handle hpackedcard, boolean flscriptedcard, tycardeventcallback lcallback);
  
  boolean setObjectValue (hdlcard, bigstring, Handle);

[frontierkernel-commits] Frontier/Common/IowaRuntime/Source iowaruntime.c,1.5,1.5.4.1,pre_int64_branch iowascript.c,1.3,1.3.6.1,pre_int64_branch

[Karsten W. <kar...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22236/Source

Modified Files:
      Tag: pre_int64_branch
	iowaruntime.c iowascript.c 
Log Message:
compiler warning fixes

Index: iowascript.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowascript.c,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -d -r1.3 -r1.3.6.1
*** iowascript.c	11 Jan 2005 22:47:40 -0000	1.3
--- iowascript.c	14 Feb 2006 11:36:00 -0000	1.3.6.1
***************
*** 389,395 ****
  
  static boolean rungraphicalurl (Handle hscript, bigstring errorstring) {
! 	
  	setstringlength (errorstring, 0);
! 	
  	return (true);
  	} /*rungraphicalurl*/
--- 389,396 ----
  
  static boolean rungraphicalurl (Handle hscript, bigstring errorstring) {
! #pragma unused (hscript)
! 
  	setstringlength (errorstring, 0);
! 
  	return (true);
  	} /*rungraphicalurl*/
***************
*** 509,521 ****
  	if (flgetreturn)
  	
! 		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 	
! 			copydatahandle (&resultdesc, hreturns);
! 			
! 		#else
! 		
! 			*hreturns = resultdesc.dataHandle;
! 		
! 		#endif
  	else
  		AEDisposeDesc (&resultdesc);
--- 510,522 ----
  	if (flgetreturn)
  	
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 
! 		copydatahandle (&resultdesc, hreturns);
! 
! #else
! 
! 	*hreturns = resultdesc.dataHandle;
! 
! #endif
  	else
  		AEDisposeDesc (&resultdesc);

Index: iowaruntime.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowaruntime.c,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -C2 -d -r1.5 -r1.5.4.1
*** iowaruntime.c	24 Jan 2005 02:11:50 -0000	1.5
--- iowaruntime.c	14 Feb 2006 11:35:56 -0000	1.5.4.1
***************
*** 306,310 ****
  	hdlcard hc;
  	boolean beginendupdate;
! 	
  	if (hw == nil) // 7.3.97 dmb: can happen when multiple cards are started quickly
  		return;
--- 306,312 ----
  	hdlcard hc;
  	boolean beginendupdate;
! 	Rect		windBounds;	// kw - 2006-02-02 --- osx refactoring
! 	CGrafPtr	thePort;
[...1326 lines suppressed...]
--- 2646,2664 ----
  			}
  		}
  
+ 	thePort = getmacwindowport(modelesswindow);
+ 	
  	SetPort (thePort);
  	
  	sendinitmessage ();
  
! exit:
  	
+ 	/*restore saved globals*/
+ 	{
  		iowadata = oldiowadata;
! 
  		runtimedata = oldruntimedata;
! 
  		SetPort (oldport);
  		}

[frontierkernel-commits] Frontier/Common/IOAToolkit ioa.c,1.4,1.4.6.1,pre_int64_branch ioabutton.c,1.4.6.1,1.4.6.2,pre_int64_branch ioacolorpopup.c,1.5,1.5.6.1,pre_int64_branch ioaedittext.c,1.3,1.3.6.1,pre_int64_branch ioaframe.c,1.3,1.3.6.1,pre_int64_branch ioaradio.c,1.4.6.1,1.4.6.2,pre_int64_branch

[Karsten W. <kar...@us...>]

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

Modified Files:
      Tag: pre_int64_branch
	ioa.c ioabutton.c ioacolorpopup.c ioaedittext.c ioaframe.c 
	ioaradio.c 
Log Message:
compiler warning fixes

Index: ioabutton.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioabutton.c,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -C2 -d -r1.4.6.1 -r1.4.6.2
*** ioabutton.c	31 Jan 2006 16:33:23 -0000	1.4.6.1
--- ioabutton.c	14 Feb 2006 11:34:22 -0000	1.4.6.2
***************
*** 300,304 ****
  	
  static boolean recalcbutton (hdlobject h, boolean flmajorrecalc) {
! 	
  	bigstring errorstring;
  	Handle hvalue;
--- 300,305 ----
  	
  static boolean recalcbutton (hdlobject h, boolean flmajorrecalc) {
! #pragma unused (flmajorrecalc)
! 
  	bigstring errorstring;
  	Handle hvalue;
***************
*** 316,320 ****
  
  static boolean clickbutton (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
! 	
  	IOArunbuttonscript (h);
  	
--- 317,322 ----
  
  static boolean clickbutton (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
! #pragma unused (listhead, pt, flshiftkey, fl2click)
! 
  	IOArunbuttonscript (h);
  	

Index: ioacolorpopup.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioacolorpopup.c,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -C2 -d -r1.5 -r1.5.6.1
*** ioacolorpopup.c	11 Jan 2005 22:47:38 -0000	1.5
--- ioacolorpopup.c	14 Feb 2006 11:34:22 -0000	1.5.6.1
***************
*** 437,441 ****
  
  static boolean clickcolorpopup (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
! 	
  	hdlcolordata hdata = (hdlcolordata) (**h).objectdata;
  	RGBColor rgb;
--- 437,441 ----
  
  static boolean clickcolorpopup (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
! #pragma unused (listhead, flshiftkey, fl2click)
  	hdlcolordata hdata = (hdlcolordata) (**h).objectdata;
  	RGBColor rgb;
***************
*** 475,479 ****
  
  static boolean canreplicatecolorpopup (hdlobject h) {
! 	
  	return (true); 
  	} /*canreplicatecolorpopup*/
--- 475,479 ----
  
  static boolean canreplicatecolorpopup (hdlobject h) {
! #pragma unused (h)
  	return (true); 
  	} /*canreplicatecolorpopup*/
***************
*** 593,597 ****
  
  static boolean debugcolorpopup (hdlobject h, bigstring errorstring) {
! 	
  	setstringlength (errorstring, 0);
  	
--- 593,597 ----
  
  static boolean debugcolorpopup (hdlobject h, bigstring errorstring) {
! #pragma unused (h)
  	setstringlength (errorstring, 0);
  	
***************
*** 727,731 ****
  	
  static boolean recalccolorpopup (hdlobject h, boolean flmajorrecalc) {
! 	
  	bigstring errorstring;
  	Handle hrgbvalue;
--- 727,731 ----
  	
  static boolean recalccolorpopup (hdlobject h, boolean flmajorrecalc) {
! #pragma unused (flmajorrecalc)
  	bigstring errorstring;
  	Handle hrgbvalue;

Index: ioa.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioa.c,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -C2 -d -r1.4 -r1.4.6.1
*** ioa.c	11 Jan 2005 22:47:38 -0000	1.4
--- ioa.c	14 Feb 2006 11:34:22 -0000	1.4.6.1
***************
*** 494,498 ****
  	
  boolean IOAincolorwindow (hdlobject h) {
! 	
  	return (true); /*need to fill this in*/
  	} /*IOAincolorwindow*/
--- 494,499 ----
  	
  boolean IOAincolorwindow (hdlobject h) {
! #pragma unused (h)
! 
  	return (true); /*need to fill this in*/
  	} /*IOAincolorwindow*/
***************
*** 525,529 ****
  
  static boolean defaultDebugObjectCallback (hdlobject h, bigstring errorstring) {
! 	
  	IOAcopystring ("\pbad object type", errorstring);
  	
--- 526,530 ----
  
  static boolean defaultDebugObjectCallback (hdlobject h, bigstring errorstring) {
! #pragma unused (h)
  	IOAcopystring ("\pbad object type", errorstring);
  	
***************
*** 533,537 ****
  	
  static boolean defaultRecalcObjectCallback (hdlobject h, boolean flmajorrecalc) {
! 	
  	return (true);
  	} /*defaultRecalcObjectCallback*/
--- 534,538 ----
  	
  static boolean defaultRecalcObjectCallback (hdlobject h, boolean flmajorrecalc) {
! #pragma unused (h, flmajorrecalc)
  	return (true);
  	} /*defaultRecalcObjectCallback*/
***************
*** 539,543 ****
  
  static boolean defaultClickObjectCallback (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
! 	
  	return (false); /*don't do a minor recalc*/
  	} /*defaultClickObjectCallback*/
--- 540,545 ----
  
  static boolean defaultClickObjectCallback (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
! #pragma unused (listhead, h, pt, flshiftkey, fl2click)
! 
  	return (false); /*don't do a minor recalc*/
  	} /*defaultClickObjectCallback*/
***************
*** 545,549 ****
  
  static boolean defaultSetObjectCursorCallback (hdlobject h, Point pt) {
! 	
  	return (false); /*we accept the default cursor*/
  	} /*defaultSetObjectCursorCallback*/
--- 547,552 ----
  
  static boolean defaultSetObjectCursorCallback (hdlobject h, Point pt) {
! #pragma unused (h, pt)
! 
  	return (false); /*we accept the default cursor*/
  	} /*defaultSetObjectCursorCallback*/
***************
*** 551,555 ****
  	
  static boolean defaultCatchReturnCallback (hdlobject h) {
! 	
  	return (false); /*we don't want to intercept the Return key*/
  	} /*defaultCatchReturnCallback*/
--- 554,558 ----
  	
  static boolean defaultCatchReturnCallback (hdlobject h) {
! #pragma unused (h)
  	return (false); /*we don't want to intercept the Return key*/
  	} /*defaultCatchReturnCallback*/
***************
*** 557,561 ****
  	
  static boolean defaultUnpackDataCallback (hdlobject h) {
! 	
  	return (true); /*do nothing*/
  	} /*defaultUnpackDataCallback*/
--- 560,564 ----
  	
  static boolean defaultUnpackDataCallback (hdlobject h) {
! #pragma unused (h)
  	return (true); /*do nothing*/
  	} /*defaultUnpackDataCallback*/
***************
*** 563,567 ****
  	
  static boolean defaultAppleEventCallback (hdlobject h, AppleEvent *event) {
! 	
  	return (true); /*do nothing*/
  	} /*defaultAppleEventCallback*/
--- 566,570 ----
  	
  static boolean defaultAppleEventCallback (hdlobject h, AppleEvent *event) {
! #pragma unused (h, event)
  	return (true); /*do nothing*/
  	} /*defaultAppleEventCallback*/
***************
*** 580,584 ****
  	
  static boolean defaultDisposeDataCallback (hdlobject h) {
! 
  	return (true);
  	} /*defaultDisposeDataCallback*/
--- 583,587 ----
  	
  static boolean defaultDisposeDataCallback (hdlobject h) {
! #pragma unused (h)
  	return (true);
  	} /*defaultDisposeDataCallback*/
***************
*** 641,645 ****
  
  static pascal ComponentResult IOAclose (ComponentInstance self) {
! 	
  	return (noErr);
  	} /*IOAclose*/
--- 644,648 ----
  
  static pascal ComponentResult IOAclose (ComponentInstance self) {
! #pragma unused (self)
  	return (noErr);
  	} /*IOAclose*/
***************
*** 1292,1296 ****
  	//I changed this to plain pascal instead of static. Will this shoot things?
  static	pascal ComponentResult IOAmain (ComponentParameters *params, Handle hstorage) {
! 	
  #endif
  	
--- 1295,1299 ----
  	//I changed this to plain pascal instead of static. Will this shoot things?
  static	pascal ComponentResult IOAmain (ComponentParameters *params, Handle hstorage) {
! 
  #endif
  	

Index: ioaframe.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaframe.c,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -d -r1.3 -r1.3.6.1
*** ioaframe.c	11 Jan 2005 22:47:38 -0000	1.3
--- ioaframe.c	14 Feb 2006 11:34:22 -0000	1.3.6.1
***************
*** 175,179 ****
  
  static boolean debugframe (hdlobject h, bigstring errorstring) {
! 	
  	setstringlength (errorstring, 0);
  	
--- 175,179 ----
  
  static boolean debugframe (hdlobject h, bigstring errorstring) {
! #pragma unused (h)
  	setstringlength (errorstring, 0);
  	
***************
*** 269,273 ****
  	
  static boolean recalcframe (hdlobject h, boolean flmajorrecalc) {
! 	
  	return (IOArecalcobjectvalue (h));
  	} /*recalcframe*/
--- 269,273 ----
  	
  static boolean recalcframe (hdlobject h, boolean flmajorrecalc) {
! #pragma unused (flmajorrecalc)
  	return (IOArecalcobjectvalue (h));
  	} /*recalcframe*/

Index: ioaedittext.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaedittext.c,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -d -r1.3 -r1.3.6.1
*** ioaedittext.c	11 Jan 2005 22:47:38 -0000	1.3
--- ioaedittext.c	14 Feb 2006 11:34:22 -0000	1.3.6.1
***************
*** 214,218 ****
  
  static boolean debugedittext (hdlobject h, bigstring errorstring) {
! 	
  	setstringlength (errorstring, 0);
  	
--- 214,218 ----
  
  static boolean debugedittext (hdlobject h, bigstring errorstring) {
! #pragma unused (h)
  	setstringlength (errorstring, 0);
  	
***************
*** 257,261 ****
  	
  static boolean recalcedittext (hdlobject h, boolean flmajorrecalc) {
! 	
  	hdltextdata hdata = (hdltextdata) (**h).objectdata;
  	
--- 257,261 ----
  	
  static boolean recalcedittext (hdlobject h, boolean flmajorrecalc) {
! #pragma unused (flmajorrecalc)
  	hdltextdata hdata = (hdltextdata) (**h).objectdata;
  	
***************
*** 302,306 ****
  	
  static boolean clickedittext (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
! 	
  	hdlcard hc = (**h).owningcard;
  	
--- 302,306 ----
  	
  static boolean clickedittext (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
! #pragma unused (listhead, fl2click)
  	hdlcard hc = (**h).owningcard;
  	
***************
*** 319,323 ****
  	
  static boolean setcursoredittext (hdlobject h, Point pt) {
! 	
  	CursHandle hcursor;
  	
--- 319,323 ----
  	
  static boolean setcursoredittext (hdlobject h, Point pt) {
! #pragma unused (h, pt)
  	CursHandle hcursor;
  	
***************
*** 356,360 ****
  	
  static boolean idleedittext (hdlobject h) {
! 
  	IOAeditidle (IOAgetactiveeditrecord ());
  	
--- 356,360 ----
  	
  static boolean idleedittext (hdlobject h) {
! #pragma unused (h)
  	IOAeditidle (IOAgetactiveeditrecord ());
  	

Index: ioaradio.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaradio.c,v
retrieving revision 1.4.6.1
retrieving revision 1.4.6.2
diff -C2 -d -r1.4.6.1 -r1.4.6.2
*** ioaradio.c	2 Feb 2006 19:01:41 -0000	1.4.6.1
--- ioaradio.c	14 Feb 2006 11:34:22 -0000	1.4.6.2
***************
*** 118,134 ****
  #if TARGET_API_MAC_CARBON == 1
  
! 	static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info,
! 		UInt32 refcon, SInt16 depth, Boolean isColorDev) {
! 		
! 		//StringPtr bs = (StringPtr) refcon;
! 		
! 		//pushstyle (geneva, 10, 0);
  
! 		//movepento ((*bounds).left, (*bounds).top + 10);
! 		
! 		//pendrawstring (bs);
! 		
! 		//popstyle ();
! 		} /*MyThemeButtonDrawCallback*/
  
  #endif
--- 118,141 ----
  #if TARGET_API_MAC_CARBON == 1
  
! static void
! MyThemeButtonDrawCallback (
! 		const Rect					*bounds,
! 		ThemeButtonKind				 kind,
! 		const ThemeButtonDrawInfo	*info,
! 		UInt32						 refcon,
! 		SInt16						 depth,
! 		Boolean						 isColorDev)
! {
! #pragma unused(bounds, kind, info, refcon, depth, isColorDev)
! 	//StringPtr bs = (StringPtr) refcon;
  
! 	//pushstyle (geneva, 10, 0);
! 
! 	//movepento ((*bounds).left, (*bounds).top + 10);
! 
! 	//pendrawstring (bs);
! 
! 	//popstyle ();
! } /*MyThemeButtonDrawCallback*/
  
  #endif
***************
*** 219,223 ****
  
  static boolean initradio (tyobject *obj) {
! 	
  	return (true); /*nothing special, we do want to edit it*/
  	} /*initradio*/
--- 226,230 ----
  
  static boolean initradio (tyobject *obj) {
! #pragma unused(obj)
  	return (true); /*nothing special, we do want to edit it*/
  	} /*initradio*/
***************
*** 225,229 ****
  	
  static boolean recalcradio (hdlobject h, boolean flmajorrecalc) {
! 	
  	bigstring errorstring;
  	Handle hboolvalue;
--- 232,236 ----
  	
  static boolean recalcradio (hdlobject h, boolean flmajorrecalc) {
! #pragma unused(flmajorrecalc)
  	bigstring errorstring;
  	Handle hboolvalue;
***************
*** 239,243 ****
  
  static boolean clickradio (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
! 	
  	/*
  	the one you hit goes on, all others go off
--- 246,250 ----
  
  static boolean clickradio (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) {
! #pragma unused(pt, flshiftkey, fl2click)
  	/*
  	the one you hit goes on, all others go off

[frontierkernel-commits] odbs/mainResponderRoot/mainResponder/localization/languages/english/strings/setupFrontier/popupText webServerDomainIp,NONE,1.1,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/localization/languages/english/strings/setupFrontier/popupText
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13436

Added Files:
	webServerDomainIp 
Log Message:
webbased setup webserver domain/ip popup text

--- NEW FILE: webServerDomainIp ---
FrontierVcsFile:1:TEXT:mainResponder.localization.languages.english.strings.setupFrontier.popupText.webServerDomainIp

By default this field is set to <a href="http://en.wikipedia.org/wiki/127.0.0.1" target="_new">127.0.0.1</a>, the <a href="http://en.wikipedia.org/wiki/IP_address" target="_new">IP address</a> for the local machine.  If you leave this field set to 127.0.0.1 you will be the only one able to access the web server.

If you want the outside world to access your web server, you will need to enter a <a href="http://en.wikipedia.org/wiki/Domain_name" target="_new">domain name</a> or an IP address that is accessible to others.

[frontierkernel-commits] odbs/mainResponderRoot/mainResponder/localization/languages/english/strings/setupFrontier/popupText - New directory

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/localization/languages/english/strings/setupFrontier/popupText
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12285/popupText

Log Message:
Directory /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/localization/languages/english/strings/setupFrontier/popupText added to the repository

[frontierkernel-commits] Frontier/Common/headers shellmenu.h,1.5,1.6,

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

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

Modified Files:
	shellmenu.h 
Log Message:
Eliminated duplicate menu ID in Win32 version.

Index: shellmenu.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shellmenu.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** shellmenu.h	5 Feb 2006 16:18:38 -0000	1.5
--- shellmenu.h	12 Feb 2006 11:26:16 -0000	1.6
***************
*** 78,82 ****
  	#define justifymenu 3500
  	#define findandreplacemenu 3600
! 	#define virtualmenu 4000
  	#define commonstylesmenu 3700 /*7.0b26 PBS*/
  	#define newobjectmenu 3800
--- 78,82 ----
  	#define justifymenu 3500
  	#define findandreplacemenu 3600
! 	#define virtualmenu 4100
  	#define commonstylesmenu 3700 /*7.0b26 PBS*/
  	#define newobjectmenu 3800

[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/Frontier shipdate,1.1.1.1,1.2,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/Frontier
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6489

Modified Files:
	shipdate 
Log Message:
set ship and initial last update dates

Index: shipdate
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/Frontier/shipdate,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** shipdate	26 Mar 2005 19:42:47 -0000	1.1.1.1
--- shipdate	11 Feb 2006 21:25:56 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:date:system.verbs.builtins.Frontier.shipdate
  
! 1/29/05; 1:13:54 PM
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:date:system.verbs.builtins.Frontier.shipdate
  
! 2/13/06; 12:00:00 AM
\ No newline at end of file

[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/Frontier/data initialLastUpdateTime,1.1,1.2,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/Frontier/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6465

Modified Files:
	initialLastUpdateTime 
Log Message:
set ship and initial last update dates

Index: initialLastUpdateTime
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/Frontier/data/initialLastUpdateTime,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** initialLastUpdateTime	13 Jun 2005 20:43:50 -0000	1.1
--- initialLastUpdateTime	11 Feb 2006 21:25:52 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:TEXT:system.verbs.builtins.Frontier.data.initialLastUpdateTime
  
! Mon, 27 Sep 2004 09:40:45 GMT
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:TEXT:system.verbs.builtins.Frontier.data.initialLastUpdateTime
  
! Mon, 13 Feb 2006 08:00:00 GMT
\ No newline at end of file

[frontierkernel-commits] odbs/mainResponderWebsitesRoot/sampleMrWs default,1.1,1.2,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/mainResponderWebsitesRoot/sampleMrWs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5082

Modified Files:
	default 
Log Message:
updated the instructions for copying the sample website

Index: default
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/mainResponderWebsitesRoot/sampleMrWs/default,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** default	9 Feb 2006 00:09:14 -0000	1.1
--- default	11 Feb 2006 21:21:06 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:optx:sampleMrWs.default
  
! #title "It Worked!"

Welcome to the Sample mainResponder Website.  The intent of this website is to be a focal point for sample code and best practices for making mainResponder based websites.  If you have some code to contribute that would be generally useful for mainResponder websites, let the 
<a href="http://groups.yahoo.com/group/frontierkernel/">
	Frontier Open Source Community know</a> and we'll discuss including it.
<p>
	Please make a copy of this website so that you can receive root updates to this website and not lose your changes.  This website can be used as a reference for your own work.  To make a copy of this website:
	<ul>
		<li>
			Bring {Frontier.getProgramName ()} to the front.
			<br />
			<br />
			</li>
		<li>
			Select the 
			<b>
				mainResponderWebsites.root
				</b>
			 menu item from the 
			<b>
				Window
				</b>
			 menu.
			<br />
			<br />
			</li>
		<li>
			Select the 
			<b>
				sampleMrWs
				</b>
			 item in the table.
			<br />
			<br />
			</li>
		<li>
			Select the 
			<b>
				Copy Sample mainResponder Site
				</b>
			 menu item from the 
			<b>
				Server
				</b>
			 menu.
			<br />
			<br />
			</li>
		<li>
			Enter the name of your website in the dialog and click the 
			<b>
				OK
				</b>
			 button.  You can enter the website name as a phrase like 
			<b>
				My First mainResponder Website
				</b>
			 or 
			<b>
				myFirstMainresponderWebsite
				</b>.
			<br />
			<br />
			</li>
		<li>
			Select your website in the table.
			<br />
			<br />
			</li>
		<li>
			Select the 
			<b>
				Install mainResponder Site...
				</b>
			 menu item from the 
			<b>
				Server
				</b>
			 menu.
			<br />
			<br />
			</li>
		<li>
			Enter the URL of your website in the dialog and click the 
			<b>
				OK
				</b>
			 button.  You will see a dialog confirming the installation of your website.
			<br />
			<br />
			</li>
		</ul>
	</p>
<p>
	<b>
		Links
		</b>
	<br />
	<br />
	The follow links are useful as background reading for mainResponder websites.  However, the information is not necessarily up to date with current practices.
	<br />
	<br />
	<a href="http://frontier.userland.com/stories/storyReader$616">
		Introducing mainResponder</a>
	<br />
	<br />
	<a href="http://frontier.userland.com/stories/storyReader$1003">
		Running Frontier as a Web Server</a>
	</p>
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:optx:sampleMrWs.default
  
! #title "It Worked!"

Welcome to the Sample mainResponder Website.  The intent of this website is to be a focal point for sample code and best practices for making mainResponder based websites.  If you have some code to contribute that would be generally useful for mainResponder websites, let the 
<a href="http://groups.yahoo.com/group/frontierkernel/">
	Frontier Open Source Community know</a> and we'll discuss including it.
<p>
	Please make a copy of this website so that you can receive root updates to this website and not lose your changes.  This website can be used as a reference for your own work.  To make a copy of this website:
	<ul>
		<li>
			Bring {Frontier.getProgramName ()} to the front.
			<br />
			<br />
			</li>
		<li>
			Select the 
			<b>
				Copy Sample mainResponder Site
				</b>
			 menu item from the 
			<b>
				Server
				</b>
			 menu.
			<br />
			<br />
			</li>
		<li>
			Enter the name of your website in the dialog and click the 
			<b>
				OK
				</b>
			 button.  You can enter the website name as a phrase like 
			<b>
				My First mainResponder Website
				</b>
			 or 
			<b>
				myFirstMainresponderWebsite
				</b>.
			  A table window will open showing your new website.
			<br />
			<br />
			</li>
		<li>
			Select the 
			<b>
				Install mainResponder Site...
				</b>
			 menu item from the 
			<b>
				Server
				</b>
			 menu.
			<br />
			<br />
			</li>
		<li>
			Enter the URL of your website in the dialog and click the 
			<b>
				OK
				</b>
			 button.  You will see a dialog confirming the installation of your website.
			<br />
			<br />
			</li>
		<li>
			Bring your webbrowser to the front and enter the URL for your website.  Your website should be displayed.  Congratulations!  You can now begin to explore and customize your website.
			<br />
			<br />
			</li>
		</ul>
	</p>
<p>
	<b>
		Links
		</b>
	<br />
	<br />
	The follow links are useful as background reading for mainResponder websites.  However, the information is not necessarily up to date with current practices.
	<br />
	<br />
	<a href="http://frontier.userland.com/stories/storyReader$616">
		Introducing mainResponder</a>
	<br />
	<br />
	<a href="http://frontier.userland.com/stories/storyReader$1003">
		Running Frontier as a Web Server</a>
	</p>
\ No newline at end of file

[frontierkernel-commits] odbs/mainResponderRoot/mainResponder/localization/languages/english/strings/discuss attachmentHeader,NONE,1.1,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/localization/languages/english/strings/discuss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16804

Added Files:
	attachmentHeader 
Log Message:
created

--- NEW FILE: attachmentHeader ---
FrontierVcsFile:1:TEXT:mainResponder.localization.languages.english.strings.discuss.attachmentHeader

Attachment:

[frontierkernel-commits] Frontier/Common/resources/Win32 WinLand.rc,1.15,1.16,

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

Update of /cvsroot/frontierkernel/Frontier/Common/resources/Win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19342/Common/resources/Win32

Modified Files:
	WinLand.rc 
Log Message:
Enable Open Recent sub-menu in File menu of Frontier/Win32.

Index: WinLand.rc
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/WinLand.rc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** WinLand.rc	8 Feb 2006 19:13:44 -0000	1.15
--- WinLand.rc	11 Feb 2006 14:40:35 -0000	1.16
***************
*** 259,265 ****
          MENUITEM "&New",						 newobjectmenu
          MENUITEM "&Open... \tCtrl+O",            filemenu+openitem
! #ifdef MACVERSION
!         MENUITEM "Open Recent",                filemenu+openrecentitem /* 2005-09-25 creedon */
! #endif
          MENUITEM SEPARATOR
          MENUITEM "&Close\tCtrl+W",               filemenu+closeitem
--- 259,263 ----
          MENUITEM "&New",						 newobjectmenu
          MENUITEM "&Open... \tCtrl+O",            filemenu+openitem
!         MENUITEM "Open Recent",                	 openrecentmenu /* 2006-02-11 aradke */
          MENUITEM SEPARATOR
          MENUITEM "&Close\tCtrl+W",               filemenu+closeitem

[frontierkernel-commits] Frontier/Common/source shellmenu.c,1.12,1.13, shellmouse.c,1.7,1.8,

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

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

Modified Files:
	shellmenu.c shellmouse.c 
Log Message:
Enable Open Recent sub-menu in File menu of Frontier/Win32.

Index: shellmenu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmenu.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shellmenu.c	8 Feb 2006 20:07:42 -0000	1.12
--- shellmenu.c	11 Feb 2006 14:40:34 -0000	1.13
***************
*** 1173,1179 ****
  	enablemenuitem (hmenu, openitem);
  	
- #ifndef OPMLEDITOR
  	enablemenuitem (hmenu, openrecentitem);
- #endif // OPMLEDITOR
  	
  	setmenuitemenable (hmenu, closeitem, flwindow);
--- 1173,1177 ----
***************
*** 1476,1479 ****
--- 1474,1481 ----
  	
  	shellupdatewindowmenu ();
+ 	
+ #ifndef PIKE
+ 	shellupdateopenrecentmenu ();	/* 2006-02-11 aradke */
+ #endif
  	} /*shellupdatemenus*/
  	
***************
*** 1482,1494 ****
  
  	/*
! 	2005-12-31 creedon: for host databases that don't have a Frontier.tools table, provide some of the basic file commands so that folks can work
! 						with databases
  	
  	2005-09-25 creedon: changed so that all targets can call scripts for some file/edit menu commands
  					 added open recent menu
  	
! 	7.0d6 PBS: With Pike's now-standard File menu, it's necessary to use kernel routines for New and Open. Run scripts in Pike for everything else.
  
! 	5/19/93 dmb: closefunc uses getfrontwindow, not shellwindow
  	*/
  	
--- 1484,1498 ----
  
  	/*
! 	5/19/93 dmb: closefunc uses getfrontwindow, not shellwindow
! 
! 	7.0d6 PBS: With Pike's now-standard File menu, it's necessary to use kernel routines for New and Open. Run scripts in Pike for everything else.
  	
  	2005-09-25 creedon: changed so that all targets can call scripts for some file/edit menu commands
  					 added open recent menu
  	
! 	2005-12-31 creedon: for host databases that don't have a Frontier.tools table, provide some of the basic file commands so that folks can work
! 						with databases
  
! 	2006-02-11 aradke: enable open recent menu on win32
  	*/
  	
***************
*** 2036,2051 ****
  			} /* virtual menu */
  
! 		case openrecentmenu: {
  		
! 			boolean flkernelhandledcommand = false;
  		
! 			if (!flkernelhandledcommand) /* run the script if special cases weren't handled above */
! 
! 				runopenrecentmenuscript (iditem);
  				
  			break;
  			} /* openrecentmenu */
  
! 		#endif
  
  	#ifdef WIN95VERSION
--- 2040,2055 ----
  			} /* virtual menu */
  
! 		#endif	//MACVERSION
! 
! 		#ifndef PIKE
  		
! 		case openrecentmenu: {
  		
! 			runopenrecentmenuscript (iditem);	/* 2006-02-11 aradke */
  				
  			break;
  			} /* openrecentmenu */
  
! 		#endif	//!PIKE
  
  	#ifdef WIN95VERSION
***************
*** 2432,2436 ****
  	if (countmenuitems (hmenu) == 2)
  		disableallmenuitems (hmenu);
! 		
! 	}
  
--- 2436,2440 ----
  	if (countmenuitems (hmenu) == 2)
  		disableallmenuitems (hmenu);
! 
! 	} /* shellupdateopenrecentmenu */
  

Index: shellmouse.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmouse.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shellmouse.c	5 Feb 2006 16:05:04 -0000	1.7
--- shellmouse.c	11 Feb 2006 14:40:34 -0000	1.8
***************
*** 405,413 ****
  		
  		case inMenuBar: 
- #if TARGET_API_MAC_CARBON == 1
- #ifndef OPMLEDITOR
- 			shellupdateopenrecentmenu (); /* 2005-09-25 creedon */
- #endif
- #endif
  
  			shellupdatemenus (); /*be sure the menus are properly checked and highlighted*/
--- 405,408 ----

[frontierkernel-commits] odbs/mainResponderRoot/mainResponder menu,1.5,1.6,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3102

Modified Files:
	menu 
Log Message:
change copy sample mainresponder site menu item text from a script to text

after copying the sample mainresponder site, edit it

Index: menu
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/menu,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** menu	10 Feb 2006 21:13:13 -0000	1.5
--- menu	10 Feb 2006 22:15:04 -0000	1.6
***************
*** 1,3 ****
  FrontierVcsFile:1:mbar:mainResponder.menu
  
! AAEFAQAABTMAAQAAAAAAAAAAAAAAKwADA/0E/QAAAAAAAAZHZW5ldmEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgArAAMDBwNkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAGqAAACoQAAAAAADwZHZW5ldmEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAAAAAAAAAAAsjO617/ydPcAADdZAAAA4gEjAaoCpExBTkT///////8AAAAAAABtYWMgAAAAAAAAAAAAAAAAU2VydmVyDQlTZXQgQWRtaW4gUGFzc3dvcmQuLi4NCU9wZW4gQWRtaW4gU2l0ZQ0JPSBtYWluUmVzcG9uZGVyLm1lbnVDb21tYW5kcy5lbmFibGVEaXNhYmxlTWVudUl0ZW0gKCkNCS0NCU9wZW4NCQljb25maWcucm9vdA0JCWRpc2N1c3Mucm9vdA0JCWluZGV4LnJvb3QNCQltYWluUmVzcG9uZGVyLnJvb3QNCQltZW1iZXJzLnJvb3QNCQl0ZW1wLm1haW5SZXNwb25kZXINCQl1c2VyLmRhdGFiYXNlcw0JCXVzZXIuYmV0dHkucnBjSGFuZGxlcnMNCQl1c2VyLmJldHR5LnF1ZXVlT3V0Z29pbmcNCS0NCU1ha2UgYW4gSFRUUCBSZXF1ZXN0Li4uDQlDbG9zZS9IaWRlIFdpbmRvd3MNCVdha2UgYWxsIFRocmVhZHMNCU1hcCB0byBEb21haW4uLi4NCUxvb2t1cCBEb21haW4uLi4NCVJldmVyc2UgRG9tYWluIExvb2t1cC4uLg0JLQ0JSW5zdGFsbCBtYWluUmVzcG9uZGVyIFNpdGUuLi4NCVVuaW5zdGFsbCBtYWluUmVzcG9uZGVyIFNpdGUuLi4NCT0gbG9jYWwgKHMgPSAiQ29weSBTYW1wbGUgbWFpblJlc3BvbmRlciBTaXRlIik7IGlmIHRhYmxlLmdldEN1cnNvciAoKSAhPSBAc2FtcGxlTXJXcyB7cyA9ICIoIiArIHN9OyByZXR1cm4gKHMpDQktDQlTZWFyY2ggRW5naW5lDQkJSW5kZXggU3RvcmVkIFBhZ2VzDQkJRGVsZXRlIFBhZ2UgRnJvbSBJbmRleC4uLg0JCUVkaXQgUGFnZSBJbmZvLi4uDYAAAAAAAAAAAAAACgAAAAAAAAZ+Q7QAAAAAAAoAAAAAAAAGfkO4AAAAAAAKAAAAAAAABn5DvAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAZ+RQgAAAAAAAoAAAAAAAAGfkV0AAAAAAAKAAAAAAAABn5FkAAAAAAACgAAAAAAAAZ+RZwAAAAAAAoAAAAAAAAGfkWoAAAAAAAKAAAAAAAABn5FtAAAAAAACgAAAAAAAAZ+RcAAAAAAAAoAAAAAAAAGfkXMAAAAAAAKAAAAAAAABn5F2AAAAAAAAAAAAAAACgAAAAAAAAZ+ReQAAAAAAAoAAAAAAAAGfkXwAAAAAAAKAAAAAAAABn5F/AAAAAAACgAAAAAAAAZ+RggAAAAAAAoAAAAAAAAGfkYUAAAAAAAKAAAAAAAABn5GOAAAAAAAAAAAAAAACgAAAAAAAAZ+RkQAAAAAAAoAAAAAAAAGfkZQAAAAAAAKAAAAAAAABn5GXAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAZ+RmgAAAAAAAoAAAAAAAAGfkZ0AAAAAAAKAAAAAAAABn5H4AACAAAA9gAABnAAAgAAAA8FQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAAAAALQ58nW8oO14AAAAMQAAAWYBWAIuAtlMQU5E////////AAAAAAAAbWFjIAAAAAAAAAAAAAAAAENoYW5nZXMNCTQvMTMvMDQ7IDE6MDU6NDggQU0gYnkgSkVTDQkJVXBkYXRlZCBwYXNzd29yZCBwcm9tcHQuDQk5LzMwLzAzOyAxOjAyOjUzIFBNIGJ5IEpFUw0JCVN0b3JlIHRoZSBhZG1pbiBwYXNzd29yZCBhcyBhIGJpbmFyeSB2YWx1ZS4NaWYgbm90IChtYWluUmVzcG9uZGVyLm1lbnVDb21tYW5kcy5tdXN0QmVTaXhQb2ludE9uZSAoKSkNCXJldHVybiAoZmFsc2UpDWxvY2FsIChwYXNzd29yZCkNaWYgZGlhbG9nLmdldFBhc3N3b3JkICgiU2V0IHBhc3N3b3JkIGZvciB0aGUgRnJvbnRpZXIgQWRtaW4gd2Vic2l0ZToiLCBAcGFzc3dvcmQpDQlidW5kbGUgLy9jcmVhdGUgdGhlIEFkbWluIG1lbWJlcnNoaXAgZ3JvdXAgaWYgbmVlZGVkDQkJbG9jYWwgKGFkclJvb3QgPSBAW3N5c3RlbS50ZW1wLm1haW5SZXNwb25kZXIubWVtYmVyc1Jvb3RGaWxlXSkNCQlsb2NhbCAoYWRyR3JvdXAgPSBAYWRyUm9vdF4uYWRtaW4pDQkJaWYgbm90IGRlZmluZWQgKGFkckdyb3VwXikNCQkJbmV3ICh0YWJsZVR5cGUsIGFkckdyb3VwKQ0JCWlmIG5vdCBkZWZpbmVkIChhZHJHcm91cF4uY2FsbGJhY2tzKQ0JCQluZXcgKHRhYmxlVHlwZSwgQGFkckdyb3VwXi5jYWxsYmFja3MpDQkJaWYgbm90IGRlZmluZWQgKGFkckdyb3VwXi5jb29raWVEb21haW4pDQkJCWFkckdyb3VwXi5jb29raWVEb21haW4gPSAiIg0JCWlmIG5vdCBkZWZpbmVkIChhZHJHcm91cF4uY29va2llRXhwaXJlcykNCQkJYWRyR3JvdXBeLmNvb2tpZUV4cGlyZXMgPSAiTW9uLCAwMSBBcHIgMjAzMCAwNzowMDowMCBHTVQiDQkJaWYgbm90IGRlZmluZWQgKGFkckdyb3VwXi5jb29raWVOYW1lKQ0JCQlhZHJHcm91cF4uY29va2llTmFtZSA9ICJBZG1pbiINCQlpZiBub3QgZGVmaW5lZCAoYWRyR3JvdXBeLm1haWxSZXR1cm5BZGRyZXNzKQ0JCQlhZHJHcm91cF4ubWFpbFJldHVybkFkZHJlc3MgPSB1c2VyLnByZWZzLm1haWxBZGRyZXNzDQkJaWYgbm90IGRlZmluZWQgKGFkckdyb3VwXi5tYWlsU3ViamVjdCkNCQkJYWRyR3JvdXBeLm1haWxTdWJqZWN0ID0gIkFkbWluIg0JCWlmIG5vdCBkZWZpbmVkIChhZHJHcm91cF4ubWFpbFRlbXBsYXRlKQ0JCQl3cC5uZXdUZXh0T2JqZWN0ICgiIiwgQGFkckdyb3VwXi5tYWlsVGVtcGxhdGUpDQkJaWYgbm90IGRlZmluZWQgKGFkckdyb3VwXi5vcGVuVG9QdWJsaWMpDQkJCWFkckdyb3VwXi5vcGVuVG9QdWJsaWMgPSBmYWxzZQ0JCWlmIG5vdCBkZWZpbmVkIChhZHJHcm91cF4udXNlcnMpDQkJCW5l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FSQ6vxUkQQAAAAcAAAGnAb8CbwNATEFORP///////wAAAAAAAG1hYyAAAAAAAAAAAAAAAABtYWluUmVzcG9uZGVyLm1lbnVDb21tYW5kcy51bkluc3RhbGxNYWluUmVzcG9uZGVyU2l0ZSAoKQ2AAAAAAAAAAgAAAQ4AAAX2AAICAAAPBkdlbmV2YQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAOAAAAAAAAAAC/8nPPwBIseAAAACoBAAGnAb8CbwNATEFORP///////wAAAAAAAG1hYyAAAAAAAAAAAAAAAABDaGFuZ2VzDQkyLzEwLzA2OyAxMTozOTozNyBBTSBieSBUQUMNCQlzdG9yZSB3ZWJzaXRlIHVybCBpbiBuZXdVcmwNCTEvMTcvMDY7IDEwOjE0OjAxIEFNIGJ5IFRBQw0JCWNyZWF0ZWQNDWxvY2FsICh3ZWJzaXRlTmFtZSkNDWlmIGRpYWxvZy5hc2sgKCJTaXRlIG5hbWU/IiwgQHdlYnNpdGVOYW1lKQ0JaWYgc3RyaW5nLmxvd2VyICh3ZWJzaXRlTmFtZSkgZW5kc1dpdGggIm1yd3MiDQkJd2Vic2l0ZU5hbWUgPSBzdHJpbmcuZGVsZXRlICh3ZWJzaXRlTmFtZSwgc3RyaW5nLmxlbmd0aCAod2Vic2l0ZU5hbWUpIC0gMywgNCkNCQ0JbG9jYWwgKGNhbm9uaWNhbCkNCQ0JY2Fub25pY2FsID0gc3RyaW5nLmlubmVyQ2FzZU5hbWUgKHdlYnNpdGVOYW1lKQ0JY2Fub25pY2FsID0gc3RyaW5nLm1pZCAoY2Fub25pY2FsLCAxLCAyNykNCQ0JbG9jYWwgKGFkclNpdGUgPSBAdGFibGUuZ2V0Um9vdEFkZHJlc3MgKEBzYW1wbGVNcldzKV4uW2Nhbm9uaWNhbCArICJNcldzIl0pDQkNCWlmIGRlZmluZWQgKGFkclNpdGVeKQ0JCWRpYWxvZy5hbGVydCAoIlRoZSBtYWluUmVzcG9uZGVyIHdlYnNpdGUgXCIiICsgY2Fub25pY2FsICsgIk1yV3MiICsgIlwiIGFscmVhZHkgZXhpc3RzLiIpDQkJDQkJcmV0dXJuIChmYWxzZSkNCQ0JYWRyU2l0ZV4gPSBzYW1wbGVNcldzDQkNCWFkclNpdGVeLlsiI2Z0cFNpdGUiXS5uZXdVcmwgPSBjb25maWcubWFpbnJlc3BvbmRlci5wcmVmcy5iYXNlVXJsICsgY2Fub25pY2FsICsgIi8iDQlhZHJTaXRlXi5bIiNzaXRlTmFtZSJdID0gd2Vic2l0ZU5hbWUNCQ0Jb3AubmV3T3V0bGluZU9iamVjdCAoIiN0aXRsZSBcIkl0IFdvcmtlZCFcIlxyXHJDb25ncmF0dWxhdGlvbnMgeW91IGhhdmUgY29waWVkIHRoZSBTYW1wbGUgbWFpblJlc3BvbmRlciBXZWJzaXRlIGFuZCBpbnN0YWxsZWQgdGhlIGNvcHkhIiwgQGFkclNpdGVeLmRlZmF1bHQpDQkNCWJ1bmRsZSAvLyBjaGFuZ2UgY2Fub25pY2FsIHNpdGUgcmVmZXJlbmNlcw0JCWJ1bmRsZSAvLyBzaW1wbGUgYXNzaWdubWVudA0JCQlhZHJTaXRlXi5bIiNwcmVmcyJdLnNlYXJjaC5zaXRlTmFtZSA9IGNhbm9uaWNhbA0JCQ0JCWJ1bmRsZSAvLyBzdHJpbmcgcmVwbGFjZW1lbnRzDQkJCW9uIHJlcGxhY2UgKGFkcikNCQkJCWFkcl4gPSBzdHJpbmcucmVwbGFjZSAoYWRyXiwgInNhbXBsZSIsIGNhbm9uaWNhbCkNCQkJDQkJCXJlcGxhY2UgKEBhZHJTaXRlXi5bIiNkaXNjdXNzaW9uR3JvdXAiXS5lZGl0b3JpYWxQcmVmcy5tZW1iZXJzaGlwR3JvdXApDQkJCXJlcGxhY2UgKEBhZHJTaXRlXi5bIiNtZW1iZXJzaGlwR3JvdXAiXS5jb29raWVOYW1lKQ0JCQlyZXBsYWNlIChAYWRyU2l0ZV4uWyIjcHJlZnMiXS5kZWZhdWx0TWVtYmVyc2hpcEdyb3VwKQ0JCQlyZXBsYWNlIChAYWRyU2l0ZV4uWyIjcHJlZnMiXS5kaXNjdXNzaW9uUm9vdCkNCQkJcmVwbGFjZSAoQGFkclNpdGVeLmRpc2N1c3Npb25Hcm91cC5lZGl0LlsiI21lbWJlcnMiXSkNCQkJcmVwbGFjZSAoQGFkclNpdGVeLm1lbWJlci5wcmVmZXJlbmNlcy5bIiNtZW1iZXJzIl0pDYQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAAAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAAACAAAAHgAAANMABAIAAA8FQXJpYWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAABlQAALLbhZ+0RcBMAAAASAAAASYBPwHuAsBMQU5E////////AAAAAAAAbWFjIAAAAAAAAAAAAAAAAGlmIG5vdCAoY29uZmlnLm1haW5SZXNwb25kZXIucHJlZnMuZmxTZWFyY2hFbmdpbmUpDQlkaWFsb2cuYWxlcnQgKCJDYW4ndCBpbmRleCBzdG9yZWQgcGFnZXMgYmVjYXVzZSB0aGlzIG1hY2hpbmUgaXMgbm90IGEgc2VhcmNoIGVuZ2luZSBzZXJ2ZXIuIikNCXJldHVybiAoZmFsc2UpDQ1tYWluUmVzcG9uZGVyLnNlYXJjaC5zZXJ2ZXIuaW5kZXhTdG9yZWRQYWdlcyAoKQ2AAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAAAAAgAAACQAAAEXAAUCAAAPBUFyaWFsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAZUAACy11ortEXARgAAAEoAAAEmAT8B7gLATEFORP///////wAAAAAAAG1hYyAAAAAAAAAAAAAAAABpZiBub3QgKGNvbmZpZy5tYWluUmVzcG9uZGVyLnByZWZzLmZsU2VhcmNoRW5naW5lKQ0JZGlhbG9nLmFsZXJ0ICgiQ2FuJ3QgZGVsZXRlIGEgcGFnZSBiZWNhdXNlIHRoaXMgbWFjaGluZSBpcyBub3QgYSBzZWFyY2ggZW5naW5lIHNlcnZlci4iKQ0JcmV0dXJuIChmYWxzZSkNbG9jYWwgKHVybCkNaWYgZGlhbG9nLmFzayAoIlVSTCBvZiBwYWdlIHRvIGRlbGV0ZT8iLCBAdXJsKQ0JbWFpblJlc3BvbmRlci5zZWFyY2guc2VydmVyLmRlSW5kZXhQYWdlICh1cmwsIGZsRGlhbG9nczp0cnVlKQ2AAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAAAAAgAAAE4AAAJAAAwCAAAPBUFyaWFsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAFAAUAAAZUAACy11mVtEXAQQAAAEgAAAEmAT8B7gLATEFORP///////wAAAAAAAG1hYyAAAAAAAAAAAAAAAABpZiBub3QgKGNvbmZpZy5tYWluUmVzcG9uZGVyLnByZWZzLmZsU2VhcmNoRW5naW5lKQ0JZGlhbG9nLmFsZXJ0ICgiQ2FuJ3QgRWRpdCBQYWdlIEluZm8gYmVjYXVzZSB0aGlzIG1hY2hpbmUgaXMgbm90IGEgc2VhcmNoIGVuZ2luZSBzZXJ2ZXIuIikNCXJldHVybiAoZmFsc2UpDWxvY2FsICh1cmwpDWlmIGRpYWxvZy5hc2sgKCJVUkwgb2YgcGFnZT8iLCBAdXJsKQ0JbG9jYWwgKGluZGV4UGF0aCA9IG1haW5SZXNwb25kZXIuc2VhcmNoLnV0aWxpdGllcy5nZXRJbmRleFBhdGggKCkpDQltYWluUmVzcG9uZGVyLnNlYXJjaC51dGlsaXRpZXMuYXNzdXJlSW5kZXggKCkNCWxvY2FsIChhZHJQYWdlSW5mb1RhYmxlID0gQFtpbmRleFBhdGhdLnBhZ2VJbmZvKQ0JbG9jYWwgKGFkclBhZ2VJbmZvID0gQGFkclBhZ2VJbmZvVGFibGVeLlt1cmxdKQ0JaWYgbm90IGRlZmluZWQgKGFkclBhZ2VJbmZvXikNCQlkaWFsb2cuYWxlcnQgKCJDYW4ndCBlZGl0IGluZm8gZm9yICIgKyB1cmwgKyAiIGJlY2F1c2UgdGhlIHBhZ2UgaXNuJ3QgaW4gdGhlIGluZGV4LiIpDQkJcmV0dXJuIChmYWxzZSkNCWVkaXQgKGFkclBhZ2VJbmZvKQ2AAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAAA=
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:mbar:mainResponder.menu
  
! AAEFAQAABOYAAQAAAAAAAAAAAAAAKwADA/0E/QAAAAAAAAZHZW5ldmEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgArAAMDBwILAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAGqAAACVAAAAAAADwZHZW5ldmEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAAAAAAAAAAAAsjO618ASTkwAADdiAAAA4gEjAaoCpExBTkT///////8AAAAAAABtYWMgAAAAAAAAAAAAAAAAU2VydmVyDQlTZXQgQWRtaW4gUGFzc3dvcmQuLi4NCU9wZW4gQWRtaW4gU2l0ZQ0JPSBtYWluUmVzcG9uZGVyLm1lbnVDb21tYW5kcy5lbmFibGVEaXNhYmxlTWVudUl0ZW0gKCkNCS0NCU9wZW4NCQljb25maWcucm9vdA0JCWRpc2N1c3Mucm9vdA0JCWluZGV4LnJvb3QNCQltYWluUmVzcG9uZGVyLnJvb3QNCQltZW1iZXJzLnJvb3QNCQl0ZW1wLm1haW5SZXNwb25kZXINCQl1c2VyLmRhdGFiYXNlcw0JCXVzZXIuYmV0dHkucnBjSGFuZGxlcnMNCQl1c2VyLmJldHR5LnF1ZXVlT3V0Z29pbmcNCS0NCU1ha2UgYW4gSFRUUCBSZXF1ZXN0Li4uDQlDbG9zZS9IaWRlIFdpbmRvd3MNCVdha2UgYWxsIFRocmVhZHMNCU1hcCB0byBEb21haW4uLi4NCUxvb2t1cCBEb21haW4uLi4NCVJldmVyc2UgRG9tYWluIExvb2t1cC4uLg0JLQ0JSW5zdGFsbCBtYWluUmVzcG9uZGVyIFNpdGUuLi4NCVVuaW5zdGFsbCBtYWluUmVzcG9uZGVyIFNpdGUuLi4NCUNvcHkgU2FtcGxlIG1haW5SZXNwb25kZXIgU2l0ZS4uLg0JLQ0JU2VhcmNoIEVuZ2luZQ0JCUluZGV4IFN0b3JlZCBQYWdlcw0JCURlbGV0ZSBQYWdlIEZyb20gSW5kZXguLi4NCQlFZGl0IFBhZ2UgSW5mby4uLg2AAAAAAAAAAAAAAAoAAAAAAAAGZMNoAAAAAAAKAAAAAAAABmTDbAAAAAAACgAAAAAAAAZkw3AAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAGZMS8AAAAAAAKAAAAAAAABmTFKAAAAAAACgAAAAAAAAZkxUQAAAAAAAoAAAAAAAAGZMVQAAAAAAAKAAAAAAAABmTFXAAAAAAACgAAAAAAAAZkxWgAAAAAAAoAAAAAAAAGZMV0AAAAAAAKAAAAAAAABmTFgAAAAAAACgAAAAAAAAZkxYwAAAAAAAAAAAAAAAoAAAAAAAAGZMWYAAAAAAAKAAAAAAAABmTFpAAAAAAACgAAAAAAAAZkxbAAAAAAAAoAAAAAAAAGZMW8AAAAAAAKAAAAAAAABmTFyAAAAAAACgAAAAAAAAZkxewAAAAAAAAAAAAAAAoAAAAAAAAGZMX4AAAAAAAKAAAAAAAABmTGBAAAAAAACgAAAAAAAAZkxhAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAGZMYcAAAAAAAKAAAAAAAABmTGKAAAAAAACgAAAAAAAAZkx7QAAgAAAPYAAAZwAAIAAAAPBUFyaWFsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAAAC0OfJ1vKDteAAAADEAAAFmAVgCLgLZTEFORP///////wAAAAAAAG1hYyAAAAAAAAAAAAAAAABDaGFuZ2VzDQk0LzEzLzA0OyAxOjA1OjQ4IEFNIGJ5IEpFUw0JCVVwZGF0ZWQgcGFzc3dvcmQgcHJvbXB0Lg0JOS8zMC8wMzsgMTowMjo1MyBQTSBieSBKRVMNCQlTdG9yZSB0aGUgYWRtaW4gcGFzc3dvcmQgYXMgYSBiaW5hcnkgdmFsdWUuDWlmIG5vdCAobWFpblJlc3BvbmRlci5tZW51Q29tbWFuZHMubXVzdEJlU2l4UG9pbnRPbmUgKCkpDQlyZXR1cm4gKGZhbHNlKQ1sb2NhbCAocGFzc3dvcmQpDWlmIGRpYWxvZy5nZXRQYXNzd29yZCAoIlNldCBwYXNzd29yZCBmb3IgdGhlIEZyb250aWVyIEFkbWluIHdlYnNpdGU6IiwgQHBhc3N3b3JkKQ0JYnVuZGxlIC8vY3JlYXRlIHRoZSBBZG1pbiBtZW1iZXJzaGlwIGdyb3VwIGlmIG5lZWRlZA0JCWxvY2FsIChhZHJSb290ID0gQFtzeXN0ZW0udGVtcC5tYWluUmVzcG9uZGVyLm1lbWJlcnNSb290RmlsZV0pDQkJbG9jYWwgKGFkckdyb3VwID0gQGFkclJvb3ReLmFkbWluKQ0JCWlmIG5vdCBkZWZpbmVkIChhZHJHcm91cF4pDQkJCW5ldyAodGFibGVUeXBlLCBhZHJHcm91cCkNCQlpZiBub3QgZGVmaW5lZCAoYWRyR3JvdXBeLmNhbGxiYWNrcykNCQkJbmV3ICh0YWJsZVR5cGUsIEBhZHJHcm91cF4uY2FsbGJhY2tzKQ0JCWlmIG5vdCBkZWZpbmVkIChhZHJHcm91cF4uY29va2llRG9tYWluKQ0JCQlhZHJHcm91cF4uY29va2llRG9tYWluID0gIiINCQlpZiBub3QgZGVmaW5lZCAoYWRyR3JvdXBeLmNvb2tpZUV4cGlyZXMpDQkJCWFkckdyb3VwXi5jb29raWVFeHBpcmVzID0gIk1vbiwgMDEgQXByIDIwMzAgMDc6MDA6MDAgR01UIg0JCWlmIG5vdCBkZWZpbmVkIChhZHJHcm91cF4uY29va2llTmFtZSkNCQkJYWRyR3JvdXBeLmNvb2tpZU5hbWUgPSAiQWRtaW4iDQkJaWYgbm90IGRlZmluZWQgKGFkckdyb3VwXi5tYWlsUmV0dXJuQWRkcmVzcykNCQkJYWRyR3JvdXBeLm1haWxSZXR1cm5BZGRyZXNzID0gdXNlci5wcmVmcy5tYWlsQWRkcmVzcw0JCWlmIG5vdCBkZWZpbmVkIChhZHJHcm91cF4ubWFpbFN1YmplY3QpDQkJCWFkckdyb3VwXi5tYWlsU3ViamVjdCA9ICJBZG1pbiINCQlpZiBub3QgZGVmaW5lZCAoYWRyR3JvdXBeLm1haWxUZW1wbGF0ZSkNCQkJd3AubmV3VGV4dE9iamVjdCAoIiIsIEBhZHJHcm91cF4ubWFpbFRlbXBsYXRlKQ0JCWlmIG5vdCBkZWZpbmVkIChhZHJHcm91cF4ub3BlblRvUHVibGljKQ0JCQlhZHJHcm91cF4ub3BlblRvUHVibGljID0gZmFsc2UNCQlpZiBub3QgZGVmaW5lZCAoYWRyR3JvdXBeLnVzZXJzKQ0JCQluZXcgKHRhYmxlVHlwZSwgQGFkckdyb3VwXi51c2VycykNCQ0JbG9jYWwgKGFkck1lbWJlciA9IG1haW5SZXNwb25kZXIubWVtYmVycy5n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ZHMudW5JbnN0YWxsTWFpblJlc3BvbmRlclNpdGUgKCkNgAAAAAAAAAIAAAEmAAAGOwAAAgAADwZHZW5ldmEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAQAAAAAAAAAAv/Jzz8ASTvwAAAAsAAABpwG/Am8DQExBTkT///////8AAAAAAABtYWMgAAAAAAAAAAAAAAAAQ2hhbmdlcw0JMi8xMC8wNjsgMjowODo0OCBQTSBieSBUQUMNCQllZGl0IHNpdGUgYWZ0ZXIgY29weQ0JMi8xMC8wNjsgMTE6Mzk6MzcgQU0gYnkgVEFDDQkJc3RvcmUgd2Vic2l0ZSB1cmwgaW4gbmV3VXJsDQkxLzE3LzA2OyAxMDoxNDowMSBBTSBieSBUQUMNCQljcmVhdGVkDQ1sb2NhbCAod2Vic2l0ZU5hbWUpDQ1pZiBkaWFsb2cuYXNrICgiU2l0ZSBuYW1lPyIsIEB3ZWJzaXRlTmFtZSkNCWlmIHN0cmluZy5sb3dlciAod2Vic2l0ZU5hbWUpIGVuZHNXaXRoICJtcndzIg0JCXdlYnNpdGVOYW1lID0gc3RyaW5nLmRlbGV0ZSAod2Vic2l0ZU5hbWUsIHN0cmluZy5sZW5ndGggKHdlYnNpdGVOYW1lKSAtIDMsIDQpDQkNCWxvY2FsIChjYW5vbmljYWwpDQkNCWNhbm9uaWNhbCA9IHN0cmluZy5pbm5lckNhc2VOYW1lICh3ZWJzaXRlTmFtZSkNCWNhbm9uaWNhbCA9IHN0cmluZy5taWQgKGNhbm9uaWNhbCwgMSwgMjcpDQkNCWxvY2FsIChhZHJTaXRlID0gQHRhYmxlLmdldFJvb3RBZGRyZXNzIChAc2FtcGxlTXJXcyleLltjYW5vbmljYWwgKyAiTXJXcyJdKQ0JDQlpZiBkZWZpbmVkIChhZHJTaXRlXikNCQlkaWFsb2cuYWxlcnQgKCJUaGUgbWFpblJlc3BvbmRlciB3ZWJzaXRlIFwiIiArIGNhbm9uaWNhbCArICJNcldzIiArICJcIiBhbHJlYWR5IGV4aXN0cy4iKQ0JCQ0JCXJldHVybiAoZmFsc2UpDQkNCWFkclNpdGVeID0gc2FtcGxlTXJXcw0JDQlhZHJTaXRlXi5bIiNmdHBTaXRlIl0ubmV3VXJsID0gY29uZmlnLm1haW5yZXNwb25kZXIucHJlZnMuYmFzZVVybCArIGNhbm9uaWNhbCArICIvIg0JYWRyU2l0ZV4uWyIjc2l0ZU5hbWUiXSA9IHdlYnNpdGVOYW1lDQkNCW9wLm5ld091dGxpbmVPYmplY3QgKCIjdGl0bGUgXCJJdCBXb3JrZWQhXCJcclxyQ29uZ3JhdHVsYXRpb25zIHlvdSBoYXZlIGNvcGllZCB0aGUgU2FtcGxlIG1haW5SZXNwb25kZXIgV2Vic2l0ZSBhbmQgaW5zdGFsbGVkIHRoZSBjb3B5ISIsIEBhZHJTaXRlXi5kZWZhdWx0KQ0JDQlidW5kbGUgLy8gY2hhbmdlIGNhbm9uaWNhbCBzaXRlIHJlZmVyZW5jZXMNCQlidW5kbGUgLy8gc2ltcGxlIGFzc2lnbm1lbnQNCQkJYWRyU2l0ZV4uWyIjcHJlZnMiXS5zZWFyY2guc2l0ZU5hbWUgPSBjYW5vbmljYWwNCQkNCQlidW5kbGUgLy8gc3RyaW5nIHJlcGxhY2VtZW50cw0JCQlvbiByZXBsYWNlIChhZHIpDQkJCQlhZHJeID0gc3RyaW5nLnJlcGxhY2UgKGFkcl4sICJzYW1wbGUiLCBjYW5vbmljYWwpDQkJCQ0JCQlyZXBsYWNlIChAYWRyU2l0ZV4uWyIjZGlzY3Vzc2lvbkdyb3VwIl0uZWRpdG9yaWFsUHJlZnMubWVtYmVyc2hpcEdyb3VwKQ0JCQlyZXBsYWNlIChAYWRyU2l0ZV4uWyIjbWVtYmVyc2hpcEdyb3VwIl0uY29va2llTmFtZSkNCQkJcmVwbGFjZSAoQGFkclNpdGVeLlsiI3ByZWZzIl0uZGVmYXVsdE1lbWJlcnNoaXBHcm91cCkNCQkJcmVwbGFjZSAoQGFkclNpdGVeLlsiI3ByZWZzIl0uZGlzY3Vzc2lvblJvb3QpDQkJCXJlcGxhY2UgKEBhZHJTaXRlXi5kaXNjdXNzaW9uR3JvdXAuZWRpdC5bIiNtZW1iZXJzIl0pDQkJCXJlcGxhY2UgKEBhZHJTaXRlXi5tZW1iZXIucHJlZmVyZW5jZXMuWyIjbWVtYmVycyJdKQ0JDQllZGl0IChhZHJTaXRlKQ2EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAAAAAgAAAB4AAADTAAQCAAAPBUFyaWFsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAZUAACy24WftEXATAAAAEgAAAEmAT8B7gLATEFORP///////wAAAAAAAG1hYyAAAAAAAAAAAAAAAABpZiBub3QgKGNvbmZpZy5tYWluUmVzcG9uZGVyLnByZWZzLmZsU2VhcmNoRW5naW5lKQ0JZGlhbG9nLmFsZXJ0ICgiQ2FuJ3QgaW5kZXggc3RvcmVkIHBhZ2VzIGJlY2F1c2UgdGhpcyBtYWNoaW5lIGlzIG5vdCBhIHNlYXJjaCBlbmdpbmUgc2VydmVyLiIpDQlyZXR1cm4gKGZhbHNlKQ0NbWFpblJlc3BvbmRlci5zZWFyY2guc2VydmVyLmluZGV4U3RvcmVkUGFnZXMgKCkNgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAIAAAAkAAABFwAFAgAADwVBcmlhbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAAAAAAAAGVAAAstdaK7RFwEYAAABKAAABJgE/Ae4CwExBTkT///////8AAAAAAABtYWMgAAAAAAAAAAAAAAAAaWYgbm90IChjb25maWcubWFpblJlc3BvbmRlci5wcmVmcy5mbFNlYXJjaEVuZ2luZSkNCWRpYWxvZy5hbGVydCAoIkNhbid0IGRlbGV0ZSBhIHBhZ2UgYmVjYXVzZSB0aGlzIG1hY2hpbmUgaXMgbm90IGEgc2VhcmNoIGVuZ2luZSBzZXJ2ZXIuIikNCXJldHVybiAoZmFsc2UpDWxvY2FsICh1cmwpDWlmIGRpYWxvZy5hc2sgKCJVUkwgb2YgcGFnZSB0byBkZWxldGU/IiwgQHVybCkNCW1haW5SZXNwb25kZXIuc2VhcmNoLnNlcnZlci5kZUluZGV4UGFnZSAodXJsLCBmbERpYWxvZ3M6dHJ1ZSkNgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAIAAABOAAACQAAMAgAADwVBcmlhbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAABQAFAAAGVAAAstdZlbRFwEEAAABIAAABJgE/Ae4CwExBTkT///////8AAAAAAABtYWMgAAAAAAAAAAAAAAAAaWYgbm90IChjb25maWcubWFpblJlc3BvbmRlci5wcmVmcy5mbFNlYXJjaEVuZ2luZSkNCWRpYWxvZy5hbGVydCAoIkNhbid0IEVkaXQgUGFnZSBJbmZvIGJlY2F1c2UgdGhpcyBtYWNoaW5lIGlzIG5vdCBhIHNlYXJjaCBlbmdpbmUgc2VydmVyLiIpDQlyZXR1cm4gKGZhbHNlKQ1sb2NhbCAodXJsKQ1pZiBkaWFsb2cuYXNrICgiVVJMIG9mIHBhZ2U/IiwgQHVybCkNCWxvY2FsIChpbmRleFBhdGggPSBtYWluUmVzcG9uZGVyLnNlYXJjaC51dGlsaXRpZXMuZ2V0SW5kZXhQYXRoICgpKQ0JbWFpblJlc3BvbmRlci5zZWFyY2gudXRpbGl0aWVzLmFzc3VyZUluZGV4ICgpDQlsb2NhbCAoYWRyUGFnZUluZm9UYWJsZSA9IEBbaW5kZXhQYXRoXS5wYWdlSW5mbykNCWxvY2FsIChhZHJQYWdlSW5mbyA9IEBhZHJQYWdlSW5mb1RhYmxlXi5bdXJsXSkNCWlmIG5vdCBkZWZpbmVkIChhZHJQYWdlSW5mb14pDQkJZGlhbG9nLmFsZXJ0ICgiQ2FuJ3QgZWRpdCBpbmZvIGZvciAiICsgdXJsICsgIiBiZWNhdXNlIHRoZSBwYWdlIGlzbid0IGluIHRoZSBpbmRleC4iKQ0JCXJldHVybiAoZmFsc2UpDQllZGl0IChhZHJQYWdlSW5mbykNgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAA
\ No newline at end of file

[frontierkernel-commits] Frontier/build_GNU/tools .cvsignore,NONE,1.1, appcopyright.c,NONE,1.1, appversion.c,NONE,1.1,

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

Update of /cvsroot/frontierkernel/Frontier/build_GNU/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14244/tools

Added Files:
	.cvsignore appcopyright.c appversion.c 
Log Message:
Fixed breakage in Makefile related to my recent changes in Common/headers/versions.h. The Info.plist file in the application package should now be generated correctly again.

--- NEW FILE: .cvsignore ---
*.o

--- NEW FILE: appversion.c ---

/*	$Id: appversion.c,v 1.1 2006/02/10 21:21:16 andreradke Exp $    */

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2006-02-06 aradke: just a fancy way to extract app version string
			
*/



#include <stdio.h>

#include "versions.h"

int main () {
	printf(APP_VERSION_STRING);
	return 0;
	} /*main*/


--- NEW FILE: appcopyright.c ---

/*	$Id: appcopyright.c,v 1.1 2006/02/10 21:21:16 andreradke Exp $    */

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2006-02-06 aradke: just a fancy way to extract copyright year string
			
*/



#include <stdio.h>

#include "versions.h"

int main () {
	printf(APP_COPYRIGHT);
	return 0;
	} /*main*/

[frontierkernel-commits] Frontier/build_GNU .cvsignore,NONE,1.1, Info.plist,1.1,1.2, Makefile,1.4,1.5,

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

Update of /cvsroot/frontierkernel/Frontier/build_GNU
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14244

Modified Files:
	Info.plist Makefile 
Added Files:
	.cvsignore 
Log Message:
Fixed breakage in Makefile related to my recent changes in Common/headers/versions.h. The Info.plist file in the application package should now be generated correctly again.

Index: Info.plist
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/build_GNU/Info.plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Info.plist	3 Jan 2005 00:41:02 -0000	1.1
--- Info.plist	10 Feb 2006 21:21:15 -0000	1.2
***************
*** 155,159 ****
  	<string>${PRODUCT_NAME_STR}</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>${PRODUCT_VERSION_STR}; © 1992-${COPYRIGHT_YEAR_STR} Userland Software, Inc.</string>
  	<key>CFBundleIconFile</key>
  	<string>Frontier.icns</string>
--- 155,159 ----
  	<string>${PRODUCT_NAME_STR}</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>${PRODUCT_VERSION_STR}; © ${PRODUCT_COPYRIGHT_STR}</string>
  	<key>CFBundleIconFile</key>
  	<string>Frontier.icns</string>

--- NEW FILE: .cvsignore ---
.ranlib
Frontier.app
Frontier.rsrc

Index: Makefile
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/build_GNU/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	20 Dec 2005 22:04:06 -0000	1.4
--- Makefile	10 Feb 2006 21:21:15 -0000	1.5
***************
*** 1133,1136 ****
--- 1133,1137 ----
  	$(COMMON_OBJECTS)
  
+ 
  #================================================================================================
  # Resources Definitions
***************
*** 1214,1218 ****
  	esac
  
! MAC_$(PROJECT):	$(MAC_OBJECTS) $(BINDIR)/$(PROJECT).rsrc $(MAC_PAIGE_LIB_AR)
  	if [ ! -f ".ranlib" ]; then \
  		$(RANLIB) $(MAC_PAIGE_LIB_AR); \
--- 1215,1219 ----
  	esac
  
! MAC_$(PROJECT):	$(MAC_OBJECTS) $(BINDIR)/$(PROJECT).rsrc $(MAC_PAIGE_LIB_AR) $(MAC_INFOPLIST_OBJS)
  	if [ ! -f ".ranlib" ]; then \
  		$(RANLIB) $(MAC_PAIGE_LIB_AR); \
***************
*** 1228,1232 ****
  	mkdir -p $(BUILT_PRODUCTS_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)
  	
! 	# Copy Mach-O bimary
  	mv $(PROJECT) $(BUILT_PRODUCTS_DIR)/$(EXECUTABLE_FOLDER_PATH)
  	
--- 1229,1233 ----
  	mkdir -p $(BUILT_PRODUCTS_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)
  	
! 	# Copy Mach-O binary
  	mv $(PROJECT) $(BUILT_PRODUCTS_DIR)/$(EXECUTABLE_FOLDER_PATH)
  	
***************
*** 1241,1261 ****
  	$(RESMERGER) $(BINDIR)/$(PROJECT).rsrc -dstIs DF -o $(BUILT_PRODUCTS_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(PROJECT).rsrc
  	
! 	# Strip trademark character to prevent problems with shell quoting \
! 	#product_str=`echo $(PROJECT) | awk -F '\342' '{print $1};'`; \
! 
! 	# Parse the "versions.h" file for useful variables \
! 
! 	# Update the Info.plist \
! 	# Could append "(dbg)" to product name for Development build style \
! 	#defaults write $(BUILT_PRODUCTS_DIR)/$(CONTENTS_FOLDER_PATH)/Info CFBundleVersion $${version_str}; \
! 	# or use sed \
  
  	( \
  		product_str=$(PROJECT); \
  		\
! 		version_str=`grep "frontier_version_string" $(SRCDIR)/Common/headers/versions.h | awk -F \" '{print $$2};'`; \
! 		copyright_year_str=`grep "copyright_year_string" $(SRCDIR)/Common/headers/versions.h | awk -F \" '{print $$2};'`; \
  		\
! 		sed -e "s/\$${PRODUCT_NAME_STR}/$${product_str}/g" -e "s/\$${PRODUCT_VERSION_STR}/$${version_str}/g" -e "s/\$${COPYRIGHT_YEAR_STR}/$${copyright_year_str}/g" $(SRCROOT)/Info.plist > $(BUILT_PRODUCTS_DIR)/$(CONTENTS_FOLDER_PATH)/Info.plist; \
  	)
  	
--- 1242,1262 ----
  	$(RESMERGER) $(BINDIR)/$(PROJECT).rsrc -dstIs DF -o $(BUILT_PRODUCTS_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(PROJECT).rsrc
  	
! 	#
! 	# Extract info from Common/headers/versions.h for Info.plist file
! 	#
! 	
! 	$(CC) $(MAC_CFLAGS) -o $(SRCROOT)/tools/appversion.o $(SRCROOT)/tools/appversion.c
! 	$(CC) $(MAC_CFLAGS) -o $(SRCROOT)/tools/appcopyright.o $(SRCROOT)/tools/appcopyright.c
  
  	( \
  		product_str=$(PROJECT); \
  		\
! 		version_str=`$(SRCROOT)/tools/appversion.o`; \
! 		copyright_str=`$(SRCROOT)/tools/appcopyright.o`; \
  		\
! 		sed -e "s/\$${PRODUCT_NAME_STR}/$${product_str}/g" \
! 			-e "s/\$${PRODUCT_VERSION_STR}/$${version_str}/g" \
! 			-e "s/\$${PRODUCT_COPYRIGHT_STR}/$${copyright_str}/g" \
! 			$(SRCROOT)/Info.plist > $(BUILT_PRODUCTS_DIR)/$(CONTENTS_FOLDER_PATH)/Info.plist; \
  	)
  	
***************
*** 1286,1292 ****
  #
  clean:
! 	rm -f $(MAC_OBJECTS) $(WIN_OBJECTS)
  	rm -f $(BINDIR)/$(PROJECT).rsrc $(BINDIR)/$(PROJECT).res
  	rm -rf $(BINDIR)/$(PROJECT).app $(BINDIR)/$(PROJECT).exe
  
  installexes: $(EXES)
--- 1287,1294 ----
  #
  clean:
! 	rm -f $(MAC_OBJECTS) $(WIN_OBJECTS) $(MAC_INFOPLIST_OBJS)
  	rm -f $(BINDIR)/$(PROJECT).rsrc $(BINDIR)/$(PROJECT).res
  	rm -rf $(BINDIR)/$(PROJECT).app $(BINDIR)/$(PROJECT).exe
+ 	rm -f $(SRCROOT)/tools/appversion.o $(SRCROOT)/tools/appcopyright.o
  
  installexes: $(EXES)

[frontierkernel-commits] Frontier/build_GNU/tools - New directory

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

Update of /cvsroot/frontierkernel/Frontier/build_GNU/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12506/tools

Log Message:
Directory /cvsroot/frontierkernel/Frontier/build_GNU/tools added to the repository

[frontierkernel-commits] odbs/mainResponderRoot/mainResponder/menuCommands installMainResponderSite,1.2,1.3,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/menuCommands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10966

Modified Files:
	installMainResponderSite 
Log Message:
look for newUrl in ftpSite table, delete it after install

Index: installMainResponderSite
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/menuCommands/installMainResponderSite,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** installMainResponderSite	10 Feb 2006 03:19:39 -0000	1.2
--- installMainResponderSite	10 Feb 2006 21:14:06 -0000	1.3
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:mainResponder.menuCommands.installMainResponderSite
  
! ÇChanges
	Ç2/9/06; 1:59:07 PM by TAC
		Çfactored the installation part of the script into mainResponder.utilities.installWebsite
	Ç1/17/06; 11:30:26 AM by TAC
		Çcreated, cribbed from mainResponder.menuCommands.installSite

local (adrSite = table.getCursorAddress ());

while (sizeOf (string.parseAddress (adrSite)) > 2) {
	adrSite = parentOf (adrSite^)};

local (flIsMainResponderSite = false, siteName = nameOf (adrSite^));

if string.lower (siteName) endsWith "mrws" {
	flIsMainResponderSite = true;
	siteName = string.delete (siteName, sizeOf (siteName) - 3, infinity)};

if flIsMainResponderSite {
	local (oldUrl = adrSite^.["#ftpSite"].url);
	local (newUrl = oldUrl);
	
	if dialog.ask ("New site URL for " + siteName + ":", @newUrl) {
		mainResponder.utilities.installSite (adrSite, siteName, oldUrl, newUrl)}}
else {
	dialog.alert ("Can't install \"" + siteName + "\" because it isn't a mainResponder website.")}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:mainResponder.menuCommands.installMainResponderSite
  
! ÇChanges
	Ç2/10/06; 11:45:55 AM by TAC
		Çlook for newUrl in ftpSite table, delete it after install
	Ç2/9/06; 1:59:07 PM by TAC
		Çfactored the installation part of the script into mainResponder.utilities.installWebsite
	Ç1/17/06; 11:30:26 AM by TAC
		Çcreated, cribbed from mainResponder.menuCommands.installSite

local (adrSite = table.getCursorAddress ());

while (sizeOf (string.parseAddress (adrSite)) > 2) {
	adrSite = parentOf (adrSite^)};

local (flIsMainResponderSite = false, siteName = nameOf (adrSite^));

if string.lower (siteName) endsWith "mrws" {
	flIsMainResponderSite = true;
	siteName = string.delete (siteName, sizeOf (siteName) - 3, infinity)};

if flIsMainResponderSite {
	local (oldUrl = adrSite^.["#ftpSite"].url);
	local (newUrl = oldUrl);
	
	try {
		newUrl = adrSite^.["#ftpSite"].newUrl};
	
	if dialog.ask ("New site URL for " + siteName + ":", @newUrl) {
		mainResponder.utilities.installSite (adrSite, siteName, oldUrl, newUrl);
		
		try {
			delete (@adrSite^.["#ftpSite"].newUrl)}}}
else {
	dialog.alert ("Can't install \"" + siteName + "\" because it isn't a mainResponder website.")}
\ No newline at end of file

[frontierkernel-commits] odbs/mainResponderRoot/mainResponder/utilities installSite,1.1,1.2,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/utilities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10851

Modified Files:
	installSite 
Log Message:
update navigation

Index: installSite
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/utilities/installSite,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** installSite	10 Feb 2006 03:18:15 -0000	1.1
--- installSite	10 Feb 2006 21:13:43 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:mainResponder.utilities.installSite
  
! on installSite (adrSite, siteName, oldUrl, newUrl, flNotifySiteInstalled = true, flForceSiteTree = false) {
	ÇChanges
		Ç2/9/06; 1:27:42 PM by TAC
			Çcreated, factored from mainResponder.menuCommands.installMainResponderSite
	
	config.mainresponder.sites.[siteName] = adrSite;
	
	[system.temp.mainResponder.discussRootFile].[adrSite^.["#prefs"].discussionRoot] = @adrSite^.["#discussionGroup"];
	
	[system.temp.mainResponder.membersRootFile].[adrSite^.["#prefs"].defaultMembershipGroup] = @adrSite^.["#membershipGroup"];
	
	if not (newUrl endsWith "/") {
		newUrl = newUrl + "/"};
	
	if not (string.lower (newUrl) beginsWith "http://") {
		newUrl = "http://" + newUrl};
	
	adrSite^.["#discussionGroup"].prefs.adrMsgReader = @adrSite^.discussionGroup.messageReader;
	
	if string.lower (oldUrl) != string.lower (newUrl) { // change url
		adrSite^.["#ftpSite"].url = string.replace (adrSite^.["#ftpSite"].url, oldUrl, newUrl);
		
		adrSite^.["#discussionGroup"].prefs.msgReaderUrl = string.replace (adrSite^.["#discussionGroup"].prefs.msgReaderUrl, oldUrl, newUrl);
		
		adrSite^.["#prefs"].search.siteUrl = string.replace (adrSite^.["#prefs"].search.siteUrl, oldUrl, newUrl);
		
		local (adr, s);
		
		for adr in @adrSite^.["#urls"] {
			s = string.lower (nameOf (adr^));
			
			if adr^ == nil {
				continue};
			
			case s {
				"discusseditinfrontier";
				"memberhome" {
					continue}};
			
			adr^ = string.replace (adr^, oldUrl, newUrl)}};
	
	try { // config.mainResponder.domains
		local (url = adrSite^.["#ftpSite"].url);
		local (urlParts = string.urlSplit (url));
		local (path = urlParts [3]);
		local (domain = string.lower (urlParts [2]));
		
		if sizeOf (path) > 0 or flForceSiteTree {
			if not defined (config.mainResponder.domains.[domain]) { // use default domain
				domain = "default"};
			
			mainResponder.siteTree.addSiteToTree (domain, path, adrSite, false, true)}
		else { // top-level site
			if not defined (config.mainResponder.domains.[domain]) {
				config.mainResponder.domains.[domain] = adrSite}}};
	
	if flNotifySiteInstalled {
		dialog.notify ("The mainResponder website \"" + siteName + "\" has been installed.")}};

Çbundle // testing
	ÇinstallSite (@sampleMrWs, "sample", "http://127.0.0.1/", "http://127.0.0.1/", false, true)
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:mainResponder.utilities.installSite
  
! on installSite (adrSite, siteName, oldUrl, newUrl, flNotifySiteInstalled = true, flForceSiteTree = false) {
	ÇChanges
		Ç2/10/06; 12:55:21 PM by TAC
			Çupdate navigation
		Ç2/9/06; 1:27:42 PM by TAC
			Çcreated, factored from mainResponder.menuCommands.installMainResponderSite
	
	config.mainresponder.sites.[siteName] = adrSite;
	
	[system.temp.mainResponder.discussRootFile].[adrSite^.["#prefs"].discussionRoot] = @adrSite^.["#discussionGroup"];
	
	[system.temp.mainResponder.membersRootFile].[adrSite^.["#prefs"].defaultMembershipGroup] = @adrSite^.["#membershipGroup"];
	
	if not (newUrl endsWith "/") {
		newUrl = newUrl + "/"};
	
	if not (string.lower (newUrl) beginsWith "http://") {
		newUrl = "http://" + newUrl};
	
	adrSite^.["#discussionGroup"].prefs.adrMsgReader = @adrSite^.discussionGroup.messageReader;
	
	if string.lower (oldUrl) != string.lower (newUrl) { // change url
		adrSite^.["#ftpSite"].url = string.replace (adrSite^.["#ftpSite"].url, oldUrl, newUrl);
		
		adrSite^.["#discussionGroup"].prefs.msgReaderUrl = string.replace (adrSite^.["#discussionGroup"].prefs.msgReaderUrl, oldUrl, newUrl);
		
		adrSite^.["#prefs"].search.siteUrl = string.replace (adrSite^.["#prefs"].search.siteUrl, oldUrl, newUrl);
		
		local (adr, s);
		
		for adr in @adrSite^.["#urls"] {
			s = string.lower (nameOf (adr^));
			
			if adr^ == nil {
				continue};
			
			case s {
				"discusseditinfrontier";
				"memberhome" {
					continue}};
			
			adr^ = string.replace (adr^, oldUrl, newUrl)};
		
		bundle { // update navigation
			local (oldPath, newPath, structure);
			
			bundle { // old path
				oldPath = string.urlSplit (oldUrl);
				oldPath = "/" + oldPath [3]};
			
			bundle { // new path
				newPath = string.urlSplit (newUrl);
				newPath = "/" + newPath [3]};
			
			xml.compile (string (adrSite^.["#navigator"].outline), @structure);
			
			for adr in @structure [1] {
				adr^.["/atts"].pagename = string.replace (adr^.["/atts"].pagename, oldPath, newPath)};
			
			s = xml.decompile (@structure);
			s = string.delete (s, 1, string.patternMatch ('\n', s));
			
			op.newOutlineObject (s, @adrSite^.["#navigator"].outline)}};
	
	try { // config.mainResponder.domains
		local (url = adrSite^.["#ftpSite"].url);
		local (urlParts = string.urlSplit (url));
		local (path = urlParts [3]);
		local (domain = string.lower (urlParts [2]));
		
		if sizeOf (path) > 0 or flForceSiteTree {
			if not defined (config.mainResponder.domains.[domain]) { // use default domain
				domain = "default"};
			
			mainResponder.siteTree.addSiteToTree (domain, path, adrSite, false, true)}
		else { // top-level site
			if not defined (config.mainResponder.domains.[domain]) {
				config.mainResponder.domains.[domain] = adrSite}}};
	
	if flNotifySiteInstalled {
		dialog.notify ("The mainResponder website \"" + siteName + "\" has been installed.")}};

Çbundle // testing
	ÇinstallSite (@myFirstMainresponderWebsiteMrWs, "myFirstMainresponderWebsite", "http://127.0.0.1/myFirstMainresponderWebsite/", "http://127.0.0.1/", false, true)
	ÇinstallSite (@myFirstMainresponderWebsiteMrWs, "myFirstMainresponderWebsite", "http://127.0.0.1/", "http://127.0.0.1/myFirstMainresponderWebsite/", false, true)
	ÇinstallSite (@sampleMrWs, "sample", "http://127.0.0.1/", "http://127.0.0.1/", false, true)
\ No newline at end of file