From: Andreas H. <ah...@us...> - 2004-04-15 08:34:01
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23769/run Modified Files: JvLabel.pas Log Message: Added missing teWordEllipsis and changed Flags type from Word to Integer Index: JvLabel.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvLabel.pas,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** JvLabel.pas 15 Apr 2004 08:27:39 -0000 1.29 --- JvLabel.pas 15 Apr 2004 08:33:52 -0000 1.30 *************** *** 63,67 **** TShadowPosition = (spLeftTop, spLeftBottom, spRightBottom, spRightTop); TJvLabelRotateAngle = 0..360; ! TJvTextEllipsis = (teNone, tePathEllipsis, teEndEllipsis); TJvCustomLabel = class(TJvGraphicControl) --- 63,67 ---- TShadowPosition = (spLeftTop, spLeftBottom, spRightBottom, spRightTop); TJvLabelRotateAngle = 0..360; ! TJvTextEllipsis = (teNone, teWordEllipsis, tePathEllipsis, teEndEllipsis); TJvCustomLabel = class(TJvGraphicControl) *************** *** 127,132 **** procedure VisibleChanged; override; ! procedure DoDrawCaption(var Rect: TRect; Flags: Word); virtual; ! procedure DoDrawText(var Rect: TRect; Flags: Word); virtual; procedure AdjustBounds; {$IFDEF VCL} --- 127,132 ---- procedure VisibleChanged; override; ! procedure DoDrawCaption(var Rect: TRect; Flags: Integer); virtual; ! procedure DoDrawText(var Rect: TRect; Flags: Integer); virtual; procedure AdjustBounds; {$IFDEF VCL} *************** *** 362,369 **** end; ! procedure TJvCustomLabel.DoDrawCaption(var Rect: TRect; Flags: Word); const ! EllipsisFlags: array[TJvTextEllipsis] of Word = ( ! 0, DT_PATH_ELLIPSIS, DT_END_ELLIPSIS ); var --- 362,369 ---- end; ! procedure TJvCustomLabel.DoDrawCaption(var Rect: TRect; Flags: Integer); const ! EllipsisFlags: array[TJvTextEllipsis] of Integer = ( ! 0, DT_WORD_ELLIPSIS, DT_PATH_ELLIPSIS, DT_END_ELLIPSIS ); var *************** *** 427,431 **** end; ! procedure TJvCustomLabel.DoDrawText(var Rect: TRect; Flags: Word); var Tmp: TSize; --- 427,431 ---- end; ! procedure TJvCustomLabel.DoDrawText(var Rect: TRect; Flags: Integer); var Tmp: TSize; |