浏览代码

* unicode fixes in TInputLine.DataSize

git-svn-id: branches/unicodekvm@48618 -
nickysn 4 年之前
父节点
当前提交
1a643e250a
共有 1 个文件被更改,包括 6 次插入0 次删除
  1. 6 0
      packages/fv/src/dialogs.inc

+ 6 - 0
packages/fv/src/dialogs.inc

@@ -1380,9 +1380,15 @@ FUNCTION TInputLine.DataSize: Sw_Word;
 VAR DSize: Sw_Word;
 VAR DSize: Sw_Word;
 BEGIN
 BEGIN
    DSize := 0;                                        { Preset zero datasize }
    DSize := 0;                                        { Preset zero datasize }
+{$ifdef FV_UNICODE}
+   If (Validator <> Nil) AND (Data <> '') Then
+     DSize := Validator^.Transfer(Data, Nil,
+       vtDataSize);                                   { Add validator size }
+{$else FV_UNICODE}
    If (Validator <> Nil) AND (Data <> Nil) Then
    If (Validator <> Nil) AND (Data <> Nil) Then
      DSize := Validator^.Transfer(Data^, Nil,
      DSize := Validator^.Transfer(Data^, Nil,
        vtDataSize);                                   { Add validator size }
        vtDataSize);                                   { Add validator size }
+{$endif FV_UNICODE}
    If (DSize <> 0) Then DataSize := DSize             { Use validtor size }
    If (DSize <> 0) Then DataSize := DSize             { Use validtor size }
      Else DataSize := MaxLen + 1;                     { No validator use size }
      Else DataSize := MaxLen + 1;                     { No validator use size }
 END;
 END;