[JVCL-Checkins] dev/JVCL3/run JvUnicodeCanvas.pas,1.17,1.18 - Fixed Mantis #2011

[Andreas H. <ah...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30914/run

Modified Files:
	JvUnicodeCanvas.pas 
Log Message:
Fixed Mantis #2011


Index: JvUnicodeCanvas.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvUnicodeCanvas.pas,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** JvUnicodeCanvas.pas	25 Jul 2004 05:42:27 -0000	1.17
--- JvUnicodeCanvas.pas	20 Aug 2004 21:11:08 -0000	1.18
***************
*** 91,95 ****
  begin
    Changing;
!   W := TextWidth(Text);
    if CanvasOrientation = coRightToLeft then
      Inc(X, W + 1);
--- 91,95 ----
  begin
    Changing;
!   W := TextWidthW(Text);
    if CanvasOrientation = coRightToLeft then
      Inc(X, W + 1);
***************
*** 108,112 ****
      Options := Options or ETO_OPAQUE;
    if ((TextFlags and ETO_RTLREADING) <> 0) and (CanvasOrientation = coRightToLeft) then
!     Inc(X, TextWidth(Text) + 1);
    Windows.ExtTextOutW(Handle, X, Y, Options, @Rect, PWideChar(Text), Length(Text), nil);
    Changed;
--- 108,112 ----
      Options := Options or ETO_OPAQUE;
    if ((TextFlags and ETO_RTLREADING) <> 0) and (CanvasOrientation = coRightToLeft) then
!     Inc(X, TextWidthW(Text) + 1);
    Windows.ExtTextOutW(Handle, X, Y, Options, @Rect, PWideChar(Text), Length(Text), nil);
    Changed;
***************
*** 115,124 ****
  function TJvUnicodeCanvas.TextWidthW(const Text: WideString): Integer;
  begin
!   Result := TextExtent(Text).cx;
  end;
  
  function TJvUnicodeCanvas.TextHeightW(const Text: WideString): Integer;
  begin
!   Result := TextExtent(Text).cy;
  end;
  
--- 115,124 ----
  function TJvUnicodeCanvas.TextWidthW(const Text: WideString): Integer;
  begin
!   Result := TextExtentW(Text).cx;
  end;
  
  function TJvUnicodeCanvas.TextHeightW(const Text: WideString): Integer;
  begin
!   Result := TextExtentW(Text).cy;
  end;