+ unicode fixes in TCluster.DrawMultiBox

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

packages/fv/examples/testuapp.pas

@@ -106,10 +106,10 @@ begin
   P := New(PDialog, Init(R, '테스트 대화 상자'));         { Create dialog }
   If (P <> Nil) Then Begin                           { Dialog valid }
     R.Assign(5, 5, 20, 7);                          { Allocate area }
-    //P^.Insert(New(PCheckBoxes, Init(R,
-    //  NewSItem('Test',
-    //  NewSITem('Item 2', Nil)))));                   { Insert check box }
-    //R.Assign(5, 2, 20, 3);                           { Assign area }
+    P^.Insert(New(PCheckBoxes, Init(R,
+      NewSItem('Test',
+      NewSITem('Item 2', Nil)))));                   { Insert check box }
+    R.Assign(5, 2, 20, 3);                           { Assign area }
 
     //B := New(PScrollBar, Init(R));                   { Insert scroll bar }
     //If (B <> Nil) Then Begin                         { Scrollbar valid }

packages/fv/src/dialogs.inc

@@ -2287,7 +2287,7 @@ BEGIN
        Cur := J*Size.Y + I;                           { Current line }
        If (Cur < Strings.Count) Then Begin
          Col := Column(Cur);                          { Calc column }
-         If (Col + CStrLen(PString(Strings.At(Cur))^)+
+         If (Col + CStrLen(Sw_PString(Strings.At(Cur)) Sw_PString_Deref)+
          5 < Sizeof(TDrawBuffer) DIV SizeOf(Word))
          AND (Col < Size.X) Then Begin            { Text fits in column }
            If NOT ButtonState(Cur) Then
@@ -2305,8 +2305,8 @@ BEGIN
            WordRec(B[Col+2]).Lo := Byte(Marker[
              MultiMark(Cur) + 1]);                    { Transfer marker }
 {$endif FV_UNICODE}
-           MoveCStr(B[Col+5], PString(Strings.At(
-             Cur))^, Color);                          { Transfer item string }
+           MoveCStr(B[Col+5], Sw_PString(Strings.At(
+             Cur)) Sw_PString_Deref, Color);                          { Transfer item string }
            If ShowMarkers AND (State AND sfFocused <> 0)
            AND (Cur = Sel) Then Begin                 { Current is selected }
 {$ifdef FV_UNICODE}