[JVCL-Checkins] CVS: jvcl/source JvEdit.pas,1.22,1.23 JvMaskEdit.pas,1.15,1.16 JvToolEdit.pas,1.24,1.25

[Peter T. <pe...@us...>]

Update of /cvsroot/jvcl/jvcl/source
In directory sc8-pr-cvs1:/tmp/cvs-serv7052/source

Modified Files:
	JvEdit.pas JvMaskEdit.pas JvToolEdit.pas 
Log Message:
-Updates from Andreas Hausladen

Index: JvEdit.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvEdit.pas,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** JvEdit.pas	11 Jun 2003 13:14:59 -0000	1.22
--- JvEdit.pas	14 Jun 2003 09:14:52 -0000	1.23
***************
*** 48,52 ****
  uses
    Windows, Messages, SysUtils, Classes, Graphics, Controls, StdCtrls, Forms,
!   JvCaret, JvComponent, JvPropAutoSave, JvMaxPixel, JVCLVer;
  
  type
--- 48,52 ----
  uses
    Windows, Messages, SysUtils, Classes, Graphics, Controls, StdCtrls, Forms,
!   JvCaret, JvComponent, JvPropAutoSave, JvMaxPixel, JVCLVer, JvToolEdit;
  
  type
***************
*** 456,462 ****
  procedure TJvCustomEdit.WMPaint(var Msg: TWMPaint);
  var
!   Canvas: TCanvas;
!   Ps: TPaintStruct;
!   CallEndPaint: Boolean;
  begin
    if Enabled then
--- 456,461 ----
  procedure TJvCustomEdit.WMPaint(var Msg: TWMPaint);
  var
!   Canvas: TControlCanvas;
!   S: string;
  begin
    if Enabled then
***************
*** 464,502 ****
    else
    begin
!     CallEndPaint := False;
!     Canvas := TCanvas.Create;
!     try
!       if Msg.DC <> 0 then
!       begin
!         Canvas.Handle := Msg.DC;
!         Ps.fErase := True;
!       end
!       else
!       begin
!         BeginPaint(Handle, Ps);
!         CallEndPaint := True;
!         Canvas.Handle := Ps.hdc;
!       end;
! 
!       if Ps.fErase then
!         Perform(WM_ERASEBKGND, Canvas.handle, 0);
! 
!       SaveDC(Canvas.Handle);
!       try
!         Canvas.Brush.Style := bsClear;
!         Canvas.Font := Font;
!         Canvas.Font.Color := FDisabledTextColor;
!         if PasswordChar = #0 then
!           Canvas.TextOut(1, 1, Text)
!         else
!           Canvas.TextOut(1, 1, StrFillChar(PasswordChar, Length(Text)))
!       finally
!         RestoreDC(Canvas.Handle, -1);
!       end;
!     finally
!       if CallEndPaint then
!         EndPaint(Handle, Ps);
!       Canvas.Free;
!     end;
    end;
  end;
--- 463,475 ----
    else
    begin
!     if PasswordChar = #0 then
!       S := Text
!     else
!       S := StrFillChar(PasswordChar, Length(Text));
!     Canvas := nil;
!     if not PaintEdit(Self, S, FAlignment, False, 0, FDisabledTextColor,
!        Focused, Canvas, Msg) then
!       inherited;
!     Canvas.Free;
    end;
  end;

Index: JvMaskEdit.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvMaskEdit.pas,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** JvMaskEdit.pas	11 Jun 2003 13:15:00 -0000	1.15
--- JvMaskEdit.pas	14 Jun 2003 09:14:52 -0000	1.16
***************
*** 36,40 ****
  uses
    Windows, Messages, SysUtils, Classes, Graphics, Controls, Mask, Forms,
!   JvCaret, JvComponent, JvTypes, JVCLVer;
  
  type
--- 36,40 ----
  uses
    Windows, Messages, SysUtils, Classes, Graphics, Controls, Mask, Forms,
!   JvCaret, JvComponent, JvTypes, JVCLVer, JvToolEdit;
  
  type
***************
*** 410,417 ****
  
  procedure TJvCustomMaskEdit.WMPaint(var Msg: TWMPaint);
  var
!   Canvas: TCanvas;
!   Ps: TPaintStruct;
!   CallEndPaint: Boolean;
  begin
    if Enabled then
--- 410,427 ----
  
  procedure TJvCustomMaskEdit.WMPaint(var Msg: TWMPaint);
+ const
+   AlignmentValues: array[False..True, TAlignment] of TAlignment = (
+     (taLeftJustify, taRightJustify, taCenter),
+     (taRightJustify, taLeftJustify, taCenter)
+   );
+ {$IFNDEF COMPILER4UP}
+   UseRightToLeftAlignment = False;
+ {$ENDIF}
  var
!   Canvas: TControlCanvas;
!   Style: Integer;
!   AAlignment: TAlignment;
!   R: TRect;
!   ButtonWidth: Integer;
  begin
    if Enabled then
***************
*** 419,454 ****
    else
    begin
!     CallEndPaint := False;
!     Canvas := TCanvas.Create;
!     try
!       if Msg.DC <> 0 then
!       begin
!         Canvas.Handle := Msg.DC;
!         Ps.fErase := True;
!       end
!       else
!       begin
!         BeginPaint(Handle, Ps);
!         CallEndPaint := True;
!         Canvas.Handle := Ps.hdc;
!       end;
  
!       if Ps.fErase then
!         Perform(WM_ERASEBKGND, Canvas.Handle, 0);
  
!       SaveDC(Canvas.Handle);
!       try
!         Canvas.Brush.Style := bsClear;
!         Canvas.Font := Font;
!         Canvas.Font.Color := FDisabledTextColor;
!         Canvas.TextOut(1, 1, Text);
!       finally
!         RestoreDC(Canvas.Handle, -1);
!       end;
!     finally
!       if CallEndPaint then
!         EndPaint(Handle, Ps);
!       Canvas.Free;
!     end;
    end;
  end;
--- 429,454 ----
    else
    begin
!     Style := GetWindowLong(Handle, GWL_STYLE);
!     if (Style and ES_RIGHT) <> 0 then
!       AAlignment := AlignmentValues[UseRightToLeftAlignment, taRightJustify]
!     else if (Style and ES_CENTER) <> 0 then
!       AAlignment := taCenter
!     else
!       AAlignment := AlignmentValues[UseRightToLeftAlignment, taLeftJustify];
  
!     SendMessage(Handle, EM_GETRECT, 0, Integer(@R));
!     {$IFDEF COMPILER4_UP}
!     if BiDiMode = bdRightToLeft then
!       ButtonWidth := R.Left - 1
!     else
!     {$ENDIF COMPILER4_UP}
!       ButtonWidth := ClientWidth - R.Right - 2;
!     if ButtonWidth < 0 then ButtonWidth := 0;
  
!     Canvas := nil;
!     if not PaintEdit(Self, Text, AAlignment, False, ButtonWidth, FDisabledTextColor,
!        Focused, Canvas, Msg) then
!       inherited;
!     Canvas.Free;
    end;
  end;

Index: JvToolEdit.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvToolEdit.pas,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** JvToolEdit.pas	14 Jun 2003 08:37:46 -0000	1.24
--- JvToolEdit.pas	14 Jun 2003 09:14:52 -0000	1.25
***************
*** 22,26 ****
    Polaris Software
    rblaurindo
! 
  You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
  located at http://jvcl.sourceforge.net
--- 22,26 ----
    Polaris Software
    rblaurindo
!   
  You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
[...3149 lines suppressed...]
      with AControl do
***************
*** 3394,3401 ****
    DestroyLocals;
  
! {$ELSE}
  initialization
    AddExitProc(DestroyLocals);
! {$ENDIF}
  
  end.
--- 3399,3406 ----
    DestroyLocals;
  
!   {$ELSE}
  initialization
    AddExitProc(DestroyLocals);
!   {$ENDIF}
  
  end.