+ introduced the FVString type

git-svn-id: branches/unicodekvm@48587 -

packages/fv/src/drivers.inc

@@ -253,6 +253,17 @@ CONST
 {                          PUBLIC TYPE DEFINITIONS                          }
 {***************************************************************************}
 
+{---------------------------------------------------------------------------}
+{                          FV STRING TYPE DEFINITION                        }
+{---------------------------------------------------------------------------}
+
+TYPE
+{$ifdef FV_UNICODE}
+   FVString = UnicodeString;
+{$else FV_UNICODE}
+   FVString = string;
+{$endif FV_UNICODE}
+
 { ******************************* REMARK ****************************** }
 {    The TEvent definition is completely compatable with all existing   }
 {  code but adds two new fields ID and Data into the message record     }
@@ -336,11 +347,7 @@ the screen. For example, given the string '~B~roccoli' as its
 parameter, CStrLen returns 8.
 25May96 LdB
 ---------------------------------------------------------------------}
-{$ifdef FV_UNICODE}
-FUNCTION CStrLen (Const S: UnicodeString): Sw_Integer;
-{$else FV_UNICODE}
-FUNCTION CStrLen (Const S: String): Sw_Integer;
-{$endif FV_UNICODE}
+FUNCTION CStrLen (Const S: FVString): Sw_Integer;
 
 {-MoveStr------------------------------------------------------------
 Moves a string into a buffer for use with a view's WriteBuf or WriteLine.
@@ -350,11 +357,7 @@ in Dest. The high bytes of the Sw_Words are set to Attr, or remain
 unchanged if Attr is zero.
 25May96 LdB
 ---------------------------------------------------------------------}
-{$ifdef FV_UNICODE}
-PROCEDURE MoveStr (Var Dest; Const Str: UnicodeString; Attr: Byte);
-{$else FV_UNICODE}
-PROCEDURE MoveStr (Var Dest; Const Str: String; Attr: Byte);
-{$endif FV_UNICODE}
+PROCEDURE MoveStr (Var Dest; Const Str: FVString; Attr: Byte);
 
 {-MoveCStr-----------------------------------------------------------
 The characters in Str are moved into the low bytes of corresponding
@@ -363,11 +366,7 @@ Hi(Attr). Tilde characters (~) in the string toggle between the two
 attribute bytes passed in the Attr Sw_Word.
 25May96 LdB
 ---------------------------------------------------------------------}
-{$ifdef FV_UNICODE}
-PROCEDURE MoveCStr (Var Dest; Const Str: UnicodeString; Attrs: Word);
-{$else FV_UNICODE}
-PROCEDURE MoveCStr (Var Dest; Const Str: String; Attrs: Word);
-{$endif FV_UNICODE}
+PROCEDURE MoveCStr (Var Dest; Const Str: FVString; Attrs: Word);
 
 {-MoveBuf------------------------------------------------------------
 Count bytes are moved from Source into the low bytes of corresponding