Changeset 210

Timestamp:

Jun 13, 2007, 8:31:36 PM (18 years ago)

Author:

RBRi

Message:

using StringUtilsUnit

Location:

trunk/Components

Files:

• ACLDialogs.pas (modified) (2 diffs)
• CanvasFontManager.pas (modified) (4 diffs)
• ComponentsTestForm.pas (modified) (2 diffs)

trunk/Components/ACLDialogs.pas

@@ -78 +78 @@
 uses
   SysUtils,
-  Forms, Dialogs, StdCtrls, Buttons,
-  ACLStringUtility
+  Forms,
+  Dialogs,
+  StdCtrls,
+  Buttons,
 {$ifdef os2}
-  , ACLLanguageUnit, ControlsUtility
+  ACLLanguageUnit, ControlsUtility,
 {$endif}
-  ;
+  CharUtilsUnit;
 
 // -------------------------------------------------
@@ -101 +103 @@
   TheDialog := TMessageForm.Create( nil );
   TheDialog.Caption := Caption;
-  PMessage := StrDupPas( Message );
+  PMessage := NewPCharAsCopyOfStr(Message);
   TheDialog.TheText := PMessage;
 

trunk/Components/CanvasFontManager.pas

@@ -5 +5 @@
 Uses
   OS2Def,
-  Classes, Forms, PMWIN, Graphics;
+  Classes,
+  Forms,
+  PMWIN,
+  Graphics;
 
 Const
@@ -137 +140 @@
   PmDev,
   SysUtils,
-  ACLStringUtility;
+  StringUtilsUnit;
 
 Imports
@@ -246 +249 @@
     Face := FontFaces[ FaceIndex ];
 
-    if StringsSame( Face.pName^, Name ) then
+    if StrEqualIgnoringCase( Face.pName^, Name ) then
     begin
       Result := Face;
@@ -480 +483 @@
 function SubstituteBitmapFontToOutline( const FaceName: string ): string;
 begin
-  if StringsSame( FaceName, 'Helv' ) then
+  if StrEqualIgnoringCase( FaceName, 'Helv' ) then
     result := 'Helvetica'
-  else if StringsSame( FaceName, 'Tms Rmn' ) then
+  else if StrEqualIgnoringCase( FaceName, 'Tms Rmn' ) then
     result := 'Times New Roman'
-  else if StringsSame( FaceName, 'System Proportional' ) then
+  else if StrEqualIgnoringCase( FaceName, 'System Proportional' ) then
     result := 'Helvetica'
-  else if StringsSame( FaceName, 'System Monospaced' ) then
+  else if StrEqualIgnoringCase( FaceName, 'System Monospaced' ) then
     result := 'Courier'
-  else if StringsSame( FaceName, 'System VIO' ) then
+  else if StrEqualIgnoringCase( FaceName, 'System VIO' ) then
     result := 'Courier'
   else

trunk/Components/ComponentsTestForm.pas

@@ -116 +116 @@
   ControlScrolling,
   ACLResourceUtility,
-  ACLStringUtility,
   RichTextPrintUnit,
   RichTextStyleUnit,
-  ACLLanguageUnit;
+  ACLLanguageUnit,
+  CharUtilsUnit;
 
 {$R DialogIcons}
@@ -145 +145 @@
            4 );
 
-  Memo1.Lines.Add( StrNPas( p, l ) );
+  Memo1.Lines.Add( StrPasWithLength( p, l ) );
 
   StrDispose( p );