浏览代码

* compilation with 1.0.x fixed
+ infrastructure for WideCompareText implemented

florian 20 年之前
父节点
当前提交
f9d09611a8

+ 7 - 3
rtl/objpas/sysutils/sysutilh.inc

@@ -206,10 +206,10 @@ Type
   { MCBS functions }
   {$i sysansih.inc}
 
-{$ifdef HASWIDESTRING}
+{$ifndef VER1_0}
   { wide string functions }
   {$i syswideh.inc}
-{$endif}
+{$endif VER1_0}
 
   { Read filename handling functions declaration }
   {$i finah.inc}
@@ -232,7 +232,11 @@ Type
 
 {
   $Log$
-  Revision 1.11  2005-02-03 16:21:59  peter
+  Revision 1.12  2005-02-03 18:40:02  florian
+    * compilation with 1.0.x fixed
+    + infrastructure for WideCompareText implemented
+
+  Revision 1.11  2005/02/03 16:21:59  peter
     * 1.0.x fix
 
   Revision 1.10  2005/02/01 20:22:50  florian

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

@@ -67,10 +67,10 @@
   { MCBS functions }
   {$i sysansi.inc}
 
-{$ifdef HASWIDESTRING}  
+{$ifndef VER1_0}  
   { wide string functions }
   {$i syswide.inc}
-{$endif}
+{$endif VER1_0}
 
   { CPU Specific code }
   {$i sysutilp.inc}

+ 11 - 1
rtl/objpas/sysutils/syswide.inc

@@ -42,8 +42,18 @@ function WideSameStr(const s1, s2 : WideString) : Boolean;
   	result:=widestringmanager.SameWideStringProc(s1,s2);
   end;
 
+
+function WideCompareText(const s1, s2 : WideString) : PtrInt;
+  begin
+  	result:=widestringmanager.CompareTextWideStringProc(s1,s2);
+  end;
+
 {
   $Log$
-  Revision 1.1  2005-02-01 20:22:50  florian
+  Revision 1.2  2005-02-03 18:40:02  florian
+    * compilation with 1.0.x fixed
+    + infrastructure for WideCompareText implemented
+
+  Revision 1.1  2005/02/01 20:22:50  florian
     * improved widestring infrastructure manager
 }

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

@@ -23,9 +23,14 @@ function WideUpperCase(const s : WideString) : WideString;
 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;
 
 {
   $Log$
-  Revision 1.1  2005-02-01 20:22:50  florian
+  Revision 1.2  2005-02-03 18:40:02  florian
+    * compilation with 1.0.x fixed
+    + infrastructure for WideCompareText implemented
+
+  Revision 1.1  2005/02/01 20:22:50  florian
     * improved widestring infrastructure manager
 }