Changeset 396 for trunk/Components

Timestamp:

May 22, 2016, 12:18:33 PM (9 years ago)

Author:

RBRi

Message:

remove usage of ACLStringUtility

Location:

trunk/Components

Files:

• CanvasFontManager.pas (modified) (4 diffs)
• MultiColumnListBox.pas (modified) (5 diffs)

trunk/Components/CanvasFontManager.pas

@@ -5 +5 @@
 Uses
   OS2Def,
-  Classes, Forms, PMWIN, Graphics;
+  Classes,
+  Forms,
+  PMWIN,
+  Graphics;
 
 Const
@@ -132 +135 @@
 
 uses
-  PMWin, PMGpi, OS2Def, PmDev,
+  PMWin,
+  PMGpi,
+  OS2Def,
+  PmDev,
   SysUtils,
-  ACLStringUtility;
+  StringUtilsUnit;
 
 Imports
@@ -243 +249 @@
     Face := FontFaces[ FaceIndex ];
 
-    if StringsSame( Face.pName^, Name ) then
+    if StrEqualIgnoringCase( Face.pName^, Name ) then
     begin
       Result := Face;
@@ -477 +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/MultiColumnListBox.pas

@@ -175 +175 @@
 
 uses
-  ACLStringUtility;
+  StringUtilsUnit;
   
 { TMultiColumnListBox }
@@ -292 +292 @@
   Dest: TRect;
   LineClipRect: TRect;
+  tmpColumns : TStringList;
+  i : longint;
 begin
   LineClipRect := FListBox.Canvas.ClipRect;
@@ -317 +319 @@
   end;
 
-  while Line <> '' do
+  tmpColumns := TStringList.Create;
+  StrExtractStrings(tmpColumns, Line, [#9], #0);
+
+  for i := 0 to tmpColumns.Count - 1 do
   begin
-    ItemToDraw := ExtractNextValue( Line,
-                                   #9 );
+    ItemToDraw := tmpColumns[i];
     if ColumnIndex < FHeader.Sections.Count then
       ColumnWidth := FHeader.Sections[ ColumnIndex ].Width
@@ -349 +353 @@
         end
         else
+        begin
+          tmpColumns.Destroy;
           raise Exception.Create( 'Bitmap index out of range in MultiColumnListBox' )
+        end
       else
+      begin
+        tmpColumns.Destroy;
         raise Exception.Create( 'No imagelist assigned in MultiColumnListBox' );
-
+      end
     end
     else
@@ -362 +371 @@
     inc( ColumnIndex );
   end;
+  tmpColumns.Destroy;
 end;