瀏覽代碼

+ WideSameStr

florian 20 年之前
父節點
當前提交
7fa1ae2ea8
共有 4 個文件被更改,包括 29 次插入15 次删除
  1. 4 2
      rtl/inc/wstringh.inc
  2. 7 10
      rtl/inc/wstrings.inc
  3. 12 2
      rtl/objpas/sysutils/syswide.inc
  4. 6 1
      rtl/objpas/sysutils/syswideh.inc

+ 4 - 2
rtl/inc/wstringh.inc

@@ -62,7 +62,6 @@ Type
     CompUCS4 : function(p1,p2:PUC42Char) : shortint;
 }
     CompareWideStringProc : function(const s1, s2 : WideString) : PtrInt;
-    SameWideStringProc : function(const s1, s2 : WideString) : Boolean;
     CompareTextWideStringProc : function(const s1, s2 : WideString): PtrInt;
     CharLengthPCharProc : function(const Str: PChar): PtrInt;
   end;
@@ -86,7 +85,10 @@ Procedure SetWideStringManager (Const New : TWideStringManager; Var Old: TWideSt
 
 {
   $Log$
-  Revision 1.4  2005-02-26 10:21:17  florian
+  Revision 1.5  2005-02-26 15:00:14  florian
+    + WideSameStr
+
+  Revision 1.4  2005/02/26 10:21:17  florian
     + implemented WideFormat
     + some Widestring stuff implemented
     * some Widestring stuff fixed

+ 7 - 10
rtl/inc/wstrings.inc

@@ -1418,19 +1418,14 @@ function CompareWideString(const s1, s2 : WideString) : PtrInt;
   begin
     unimplementedwidestring;
   end;
-
-
-function SameWideString(const s1, s2 : WideString) : Boolean;
-  begin
-    unimplementedwidestring;
-  end;
-
+  
 
 function CompareTextWideString(const s1, s2 : WideString): PtrInt;
   begin
     unimplementedwidestring;
   end;
 
+
 function CharLengthPChar(const Str: PChar): PtrInt;
   begin
     unimplementedwidestring;
@@ -1443,8 +1438,7 @@ procedure initwidestringmanager;
     widestringmanager.Ansi2WideMoveProc:=@Ansi2WideMove;
     widestringmanager.UpperWideStringProc:=@GenericWideCase;
     widestringmanager.LowerWideStringProc:=@GenericWideCase;
-    widestringmanager.CompareWideStringProc:=@CompareWideString;
-    widestringmanager.SameWideStringProc:=@SameWideString;
+    widestringmanager.CompareWideStringProc:=@CompareWideString;    
     widestringmanager.CompareTextWideStringProc:=@CompareTextWideString;
     widestringmanager.CharLengthPCharProc:=@CharLengthPChar;
   end;
@@ -1452,7 +1446,10 @@ procedure initwidestringmanager;
 
 {
   $Log$
-  Revision 1.52  2005-02-26 10:21:17  florian
+  Revision 1.53  2005-02-26 15:00:14  florian
+    + WideSameStr
+
+  Revision 1.52  2005/02/26 10:21:17  florian
     + implemented WideFormat
     + some Widestring stuff implemented
     * some Widestring stuff fixed

+ 12 - 2
rtl/objpas/sysutils/syswide.inc

@@ -40,7 +40,7 @@ function WideCompareStr(const s1, s2 : WideString) : PtrInt;
 
 function WideSameStr(const s1, s2 : WideString) : Boolean;
   begin
-    result:=widestringmanager.SameWideStringProc(s1,s2);
+    result:=widestringmanager.CompareWideStringProc(s1,s2)=0;
   end;
 
 
@@ -48,6 +48,13 @@ function WideCompareText(const s1, s2 : WideString) : PtrInt;
   begin
     result:=widestringmanager.CompareTextWideStringProc(s1,s2);
   end;
+  
+  
+function WideSameText(const s1, s2 : WideString) : Boolean;
+  begin
+    result:=widestringmanager.CompareTextWideStringProc(s1,s2)=0;
+  end;
+  
 
 { we've no templates, but with includes we can simulate this :) }
 {$macro on}
@@ -65,7 +72,10 @@ Function WideFormat (Const Fmt : WideString; const Args : Array of const) : Wide
 
 {
   $Log$
-  Revision 1.4  2005-02-26 10:21:17  florian
+  Revision 1.5  2005-02-26 15:00:14  florian
+    + WideSameStr
+
+  Revision 1.4  2005/02/26 10:21:17  florian
     + implemented WideFormat
     + some Widestring stuff implemented
     * some Widestring stuff fixed

+ 6 - 1
rtl/objpas/sysutils/syswideh.inc

@@ -24,11 +24,16 @@ function WideLowerCase(const s : WideString) : WideString;
 function WideCompareStr(const s1, s2 : WideString) : PtrInt;
 function WideSameStr(const s1, s2 : WideString) : Boolean;
 function WideCompareText(const s1, s2 : WideString) : PtrInt;
+function WideSameText(const s1, s2 : WideString) : Boolean;
+
 Function WideFormat (Const Fmt : WideString; const Args : Array of const) : WideString;
 
 {
   $Log$
-  Revision 1.3  2005-02-26 10:21:17  florian
+  Revision 1.4  2005-02-26 15:00:14  florian
+    + WideSameStr
+
+  Revision 1.3  2005/02/26 10:21:17  florian
     + implemented WideFormat
     + some Widestring stuff implemented
     * some Widestring stuff fixed