SF.net SVN: frontierkernel: [1354] Frontier/branches/Conversant/Common/source

[<set...@us...>]

Revision: 1354
Author:   sethdill
Date:     2006-05-05 06:56:02 -0700 (Fri, 05 May 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1354&view=rev

Log Message:
-----------
Mergd trunk changes r1347:1353 into the Conversant branch.

Modified Paths:
--------------
    Frontier/branches/Conversant/Common/IowaRuntime/Source/iowaruntime.c
    Frontier/branches/Conversant/Common/source/langcard.c
    Frontier/branches/Conversant/Common/source/strings.c
    Frontier/branches/Conversant/Common/source/wpengine.c
Modified: Frontier/branches/Conversant/Common/IowaRuntime/Source/iowaruntime.c
===================================================================
--- Frontier/branches/Conversant/Common/IowaRuntime/Source/iowaruntime.c	2006-05-05 13:52:21 UTC (rev 1353)
+++ Frontier/branches/Conversant/Common/IowaRuntime/Source/iowaruntime.c	2006-05-05 13:56:02 UTC (rev 1354)
@@ -58,6 +58,7 @@
 #define	copyCmd		4
 #define	pasteCmd	5
 #define clearCmd	6
+#define selectAllCmd	8
 #endif
 
 
@@ -1722,6 +1723,11 @@
 			
 			break;
 			
+		case selectAllCmd:  /* 2006-05-04 smd */
+			editselectall (hedit);
+			
+			break;
+			
 		} /*switch*/
 		
 	return (true);

Modified: Frontier/branches/Conversant/Common/source/langcard.c
===================================================================
--- Frontier/branches/Conversant/Common/source/langcard.c	2006-05-05 13:52:21 UTC (rev 1353)
+++ Frontier/branches/Conversant/Common/source/langcard.c	2006-05-05 13:56:02 UTC (rev 1354)
@@ -145,6 +145,9 @@
 						shellwritescrap (textscraptype);
 						cardEditCommand (pasteitem); break;
 					
+					case 'a':
+						cardEditCommand (selectallitem); break;
+					
 					default:
 						handled = false; break;
 					}

Modified: Frontier/branches/Conversant/Common/source/strings.c
===================================================================
--- Frontier/branches/Conversant/Common/source/strings.c	2006-05-05 13:52:21 UTC (rev 1353)
+++ Frontier/branches/Conversant/Common/source/strings.c	2006-05-05 13:56:02 UTC (rev 1354)
@@ -2547,15 +2547,15 @@
 boolean isTextEncodingAvailable( bigstring bsEncodingName )
 {
 	long encodingId;
+	boolean fl;
 	
 	disablelangerror();
 	
-	if ( ! getTextEncodingIDFromIANA( bsEncodingName, &encodingId ) )
-		return (false);
+	fl = getTextEncodingIDFromIANA( bsEncodingName, &encodingId );
 	
 	enablelangerror();
 	
-	return ( true );
+	return ( fl );
 }
 
 static boolean converttextencoding( Handle h, Handle hresult, const long inputcharset, const long outputcharset, long * OSStatusCode )

Modified: Frontier/branches/Conversant/Common/source/wpengine.c
===================================================================
--- Frontier/branches/Conversant/Common/source/wpengine.c	2006-05-05 13:52:21 UTC (rev 1353)
+++ Frontier/branches/Conversant/Common/source/wpengine.c	2006-05-05 13:56:02 UTC (rev 1354)
@@ -4373,6 +4373,8 @@
 	
 	wpdirtyselectioninfo ();
 	
+	wpupdate();  // 2006-05-04 smd: bug fix. background color will now be restored properly, so only the selected text looks selected
+	
 	return (true);
 	} /*wpsetselection*/
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.