From: André S. <asn...@us...> - 2004-09-08 10:40:47
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26274/JVCL3/run Modified Files: JvSpin.pas Log Message: Cleaned ifdefs (brushcopy) Index: JvSpin.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvSpin.pas,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** JvSpin.pas 8 Sep 2004 04:17:14 -0000 1.59 --- JvSpin.pas 8 Sep 2004 10:40:38 -0000 1.60 *************** *** 496,500 **** TColorArray = array [0..2] of TColor; {$IFDEF VisualCLX} ! TCustomFormAccessProtected = class(TCustomForm); {$ENDIF VisualCLX} --- 496,500 ---- TColorArray = array [0..2] of TColor; {$IFDEF VisualCLX} ! THackedCustomForm = class(TCustomForm); {$ENDIF VisualCLX} *************** *** 1132,1136 **** {$ENDIF VCL} {$IFDEF VisualCLX} ! TCustomFormAccessProtected(GetParentForm(Self)).WantKey(Integer(Key), [], Key); {$ENDIF VisualCLX} if Key = Cr then --- 1132,1136 ---- {$ENDIF VCL} {$IFDEF VisualCLX} ! THackedCustomForm(GetParentForm(Self)).WantKey(Integer(Key), [], Key); {$ENDIF VisualCLX} if Key = Cr then *************** *** 2439,2444 **** --- 2439,2446 ---- begin UpArrow.LoadFromResourceName(HInstance, sSpinUpBtnPole); + UpArrow.TransparentColor := clWhite; UpArrow.Transparent := True; DownArrow.LoadFromResourceName(HInstance, sSpinDownBtnPole); + DownArrow.TransparentColor := clWhite; DownArrow.Transparent := True; PoleDrawArrows(ABitmap.Canvas, ADownState, Enabled, UpArrow, DownArrow); *************** *** 2577,2596 **** if Enabled then ! {$IFDEF VCL} ! BrushCopy(Dest, AUpArrow, Source, AUpArrow.TransparentColor) ! {$ENDIF VCL} ! {$IFDEF VisualCLX} ! BrushCopy(ACanvas, Dest, AUpArrow, Source, AUpArrow.TransparentColor) ! {$ENDIF VisualCLX} else begin DisabledBitmap := CreateDisabledBitmap(AUpArrow, clBlack); try ! {$IFDEF VCL} ! BrushCopy(Dest, DisabledBitmap, Source, DisabledBitmap.TransparentColor); ! {$ENDIF VCL} ! {$IFDEF VisualCLX} ! BrushCopy(ACanvas, Dest, DisabledBitmap, Source, DisabledBitmap.TransparentColor); ! {$ENDIF VisualCLX} finally DisabledBitmap.Free; --- 2579,2588 ---- if Enabled then ! BrushCopy({$IFDEF VisualCLX}ACanvas,{$ENDIF} Dest, AUpArrow, Source, AUpArrow.TransparentColor) else begin DisabledBitmap := CreateDisabledBitmap(AUpArrow, clBlack); try ! BrushCopy({$IFDEF VisualCLX}ACanvas,{$ENDIF} Dest, DisabledBitmap, Source, DisabledBitmap.TransparentColor); finally DisabledBitmap.Free; *************** *** 2605,2624 **** if Enabled then ! {$IFDEF VCL} ! BrushCopy(Dest, ADownArrow, Source, ADownArrow.TransparentColor) ! {$ENDIF VCL} ! {$IFDEF VisualCLX} ! BrushCopy(ACanvas, Dest, ADownArrow, Source, ADownArrow.TransparentColor) ! {$ENDIF VisualCLX} else begin DisabledBitmap := CreateDisabledBitmap(ADownArrow, clBlack); try ! {$IFDEF VCL} ! BrushCopy(Dest, DisabledBitmap, Source, DisabledBitmap.TransparentColor); ! {$ENDIF VCL} ! {$IFDEF VisualCLX} ! BrushCopy(ACanvas, Dest, DisabledBitmap, Source, DisabledBitmap.TransparentColor); ! {$ENDIF VisualCLX} finally DisabledBitmap.Free; --- 2597,2606 ---- if Enabled then ! BrushCopy({$IFDEF VisualCLX}ACanvas,{$ENDIF}Dest, ADownArrow, Source, ADownArrow.TransparentColor) else begin DisabledBitmap := CreateDisabledBitmap(ADownArrow, clBlack); try ! BrushCopy({$IFDEF VisualCLX}ACanvas,{$ENDIF} Dest, DisabledBitmap, Source, DisabledBitmap.TransparentColor); finally DisabledBitmap.Free; |