[JVCL-Checkins] dev/JVCL3/run JvProgressBar.pas,1.23,1.24 - Restored VisualCLX compatibility, cleaned ifdefs

[André S. <asn...@us...>]

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

Modified Files:
	JvProgressBar.pas 
Log Message:
Restored VisualCLX compatibility, cleaned ifdefs


Index: JvProgressBar.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvProgressBar.pas,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** JvProgressBar.pas	4 Sep 2004 06:06:25 -0000	1.23
--- JvProgressBar.pas	8 Sep 2004 07:55:11 -0000	1.24
***************
*** 148,153 ****
--- 148,158 ----
      property Color default clWindow;
      property Constraints;
+     {$IFDEF VCL}
      property DragKind;
      property DragCursor;
+     property OnEndDock;
+     property OnStartDock;
+     property OnCanResize;
+     {$ENDIF VCL}
      property DragMode;
      property Hint;
***************
*** 157,161 ****
      property ShowHint;
  
-     property OnCanResize;
      property OnClick;
      property OnConstrainedResize;
--- 162,165 ----
***************
*** 164,168 ****
      property OnDragDrop;
      property OnDragOver;
-     property OnEndDock;
      property OnEndDrag;
      property OnMouseDown;
--- 168,171 ----
***************
*** 174,178 ****
      property OnMouseWheelUp;
      {$ENDIF COMPILEr6_UP}
-     property OnStartDock;
      property OnStartDrag;
    end;
--- 177,180 ----
***************
*** 284,293 ****
    ACanvas.Brush.Color := Color;
    ACanvas.FillRect(R);
!   {$IFDEF VCL}
!   DrawEdge(ACanvas.Handle, R, BDR_SUNKENOUTER, BF_ADJUST or BF_RECT);
!   {$ENDIF VCL}
!   {$IFDEF VisualCLX}
!   DrawEdge(ACanvas, R, esNone, esLowered, ebRect);
!   {$ENDIF VisualCLX}
    if BarSize = 0 then
      Exit;
--- 286,290 ----
    ACanvas.Brush.Color := Color;
    ACanvas.FillRect(R);
!   Windows.DrawEdge(ACanvas.Handle, R, BDR_SUNKENOUTER, BF_ADJUST or BF_RECT);
    if BarSize = 0 then
      Exit;
***************
*** 478,482 ****
    ACanvas.Brush.Color := Color;
    ACanvas.FillRect(R);
!   DrawEdge(ACanvas.Handle, R, BDR_SUNKENOUTER, BF_ADJUST or BF_RECT);
    InflateRect(R, -1, -1);
    if Orientation = pbHorizontal then
--- 475,479 ----
    ACanvas.Brush.Color := Color;
    ACanvas.FillRect(R);
!   Windows.DrawEdge(ACanvas.Handle, R, BDR_SUNKENOUTER, BF_ADJUST or BF_RECT);
    InflateRect(R, -1, -1);
    if Orientation = pbHorizontal then