paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-16 14:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

changed for Delphi compatibility: changed Width,Height to Right,Bottom from Martin Smat

Browse Source 
git-svn-id: trunk@8658 -
This commit is contained in:
vincents 2006-01-29 20:25:49 +00:00
parent ab36f3dace
commit f96ac2f4bf
17 changed files with 150 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lcl/graphics.pp
View File

@ -936,9 +936,9 @@ type
procedure Arc(ALeft, ATop, ARight, ABottom, SX, SY, EX, EY: Integer); virtual;
Procedure BrushCopy(Dest: TRect; InternalImages: TBitmap; Src: TRect;
TransparentColor: TColor); virtual;
procedure Chord(x, y, AWidth, AHeight,
procedure Chord(x1, y1, x2, y2,
StartAngle16Deg, EndAngle16Deg: Integer); virtual;
procedure Chord(x, y, AWidth, AHeight, SX, SY, EX, EY: Integer); virtual;
procedure Chord(x1, y1, x2, y2, SX, SY, EX, EY: Integer); virtual;
Procedure CopyRect(const Dest: TRect; SrcCanvas: TCanvas;
const Source: TRect); virtual;
Procedure Draw(X,Y: Integer; SrcGraphic: TGraphic); virtual;
@ -958,9 +958,9 @@ type
Procedure Line(X1,Y1,X2,Y2: Integer); virtual; // short for MoveTo();LineTo(); // already in fpcanvas
Procedure LineTo(X1,Y1: Integer); virtual; // already in fpcanvas
Procedure MoveTo(X1,Y1: Integer); virtual; // already in fpcanvas
procedure RadialPie(x,y,AWidth, AHeight,
procedure RadialPie(x1, y1, x2, y2,
StartAngle16Deg, EndAngle16Deg: Integer); virtual;
procedure RadialPie(x, y, AWidth, AHeight, sx, sy, ex, ey: Integer); virtual;
procedure RadialPie(x1, y1, x2, y2, sx, sy, ex, ey: Integer); virtual;
procedure Pie(EllipseX1,EllipseY1,EllipseX2,EllipseY2,
StartX,StartY,EndX,EndY: Integer); virtual;
procedure PolyBezier(Points: PPoint; NumPts: Integer;

34
lcl/include/canvas.inc
View File

@ -511,7 +511,7 @@ end;
{------------------------------------------------------------------------------
Method: TCanvas.Arc
Params: Left,Top,AWidth,AHeight,angle1,angle2
Params: ALeft, ATop, ARight, ABottom, angle1, angle2
Returns: Nothing
Use Arc to draw an elliptically curved line with the current Pen.
@ -521,17 +521,17 @@ end;
Zero degrees is at the 3'o clock position.
------------------------------------------------------------------------------}
procedure TCanvas.Arc(ALeft,ATop,ARight,ABottom,angle1,angle2 : Integer);
procedure TCanvas.Arc(ALeft, ATop, ARight, ABottom, angle1, angle2 : Integer);
begin
Changing;
RequiredState([csHandleValid, csPenValid]);
LCLIntf.Arc(FHandle, ALeft, ATop, ARight - ALeft, ABottom - ATop, angle1, angle2);
LCLIntf.Arc(FHandle, ALeft, ATop, ARight, ABottom, angle1, angle2);
Changed;
end;
{------------------------------------------------------------------------------
Method: TCanvas.Arc
Params: DC,Left,Top,AWidth,AHeight,sx,sy,ex,ey
Params: ALeft, ATop, ARight, ABottom, sx, sy, ex, ey
Returns: Nothing
Use Arc to draw an elliptically curved line with the current Pen. The
@ -543,13 +543,13 @@ procedure TCanvas.Arc(ALeft,ATop,ARight,ABottom,sx,sy,ex,ey : Integer);
begin
Changing;
RequiredState([csHandleValid, csBrushValid, csPenValid]);
LCLIntf.RadialArc(FHandle, ALeft, ATop, ARight - ALeft, ABottom - ATop, sx, sy, ex, ey);
LCLIntf.RadialArc(FHandle, ALeft, ATop, ARight, ABottom, sx, sy, ex, ey);
Changed;
end;
{------------------------------------------------------------------------------
Method: TCanvas.RadialPie
Params: x,y, AWidth, AHeight, StartAngle16Deg, EndAngle16Deg: Integer
Params: x1, y1, x2, y2, StartAngle16Deg, EndAngle16Deg: Integer
Returns: Nothing
Use Pie to draw a filled pie-shaped wedge on the canvas.
@ -560,19 +560,19 @@ end;
Zero degrees is at the 3'o clock position.
------------------------------------------------------------------------------}
procedure TCanvas.RadialPie(x, y, AWidth, AHeight,
procedure TCanvas.RadialPie(x1, y1, x2, y2,
StartAngle16Deg, EndAngle16Deg: Integer);
begin
Changing;
RequiredState([csHandleValid, csBrushValid, csPenValid]);
LCLIntf.RadialPieWithAngles(FHandle,x,y,AWidth,AHeight,
LCLIntf.RadialPieWithAngles(FHandle, x1, y1, x2, y2,
StartAngle16Deg,EndAngle16Deg);
Changed;
end;
{------------------------------------------------------------------------------
Method: TCanvas.RadialPie
Params: x,y, AWidth, AHeight, sx,sy,ex,ey
Params: x1, y1, x2, y2, sx, sy, ex, ey
Returns: Nothing
Use Pie to draw a filled Pie-shaped wedge on the canvas. The values sx,sy,
@ -580,11 +580,11 @@ end;
the Bounding-Arc is drawn.
------------------------------------------------------------------------------}
procedure TCanvas.RadialPie(x,y, AWidth, AHeight, sx,sy,ex,ey: Integer);
procedure TCanvas.RadialPie(x1, y1, x2, y2, sx, sy, ex, ey: Integer);
begin
Changing;
RequiredState([csHandleValid, csBrushValid, csPenValid]);
LCLIntf.RadialPie(FHandle,x,y,AWidth,AHeight,sx,sy,ex,ey);
LCLIntf.RadialPie(FHandle, x1, y1, x2, y2, sx, sy, ex, ey);
Changed;
end;
@ -1259,7 +1259,7 @@ end;
{------------------------------------------------------------------------------
Method: TCanvas.Chord
Params: x,y, AWidth, AHeight, StartAngle16Deg, EndAngle16Deg
Params: x1, y1, x2, y2, StartAngle16Deg, EndAngle16Deg
Returns: Nothing
Use Chord to draw a filled Chord-shape on the canvas. The angles angle1 and
@ -1268,18 +1268,18 @@ end;
values mean clockwise direction. Zero degrees is at the 3'o clock position.
------------------------------------------------------------------------------}
procedure TCanvas.Chord(x, y, AWidth, AHeight,
procedure TCanvas.Chord(x1, y1, x2, y2,
StartAngle16Deg, EndAngle16Deg: Integer);
begin
Changing;
RequiredState([csHandleValid, csBrushValid, csPenValid]);
LCLIntf.AngleChord(FHandle,x,y,AWidth,AHeight,StartAngle16Deg,EndAngle16Deg);
LCLIntf.AngleChord(FHandle, x1, y1, x2, y2, StartAngle16Deg, EndAngle16Deg);
Changed;
end;
{------------------------------------------------------------------------------
Method: TCanvas.Chord
Params: x,y,AWidth, AHeight, sx,sy,ex,ey
Params: x1, y1, x2, y2, sx, sy, ex, ey
Returns: Nothing
Use Chord to draw a filled Chord-shape on the canvas. The values sx,sy,
@ -1287,11 +1287,11 @@ end;
the Arc is draw.
------------------------------------------------------------------------------}
procedure TCanvas.Chord(x,y,AWidth, AHeight, sx,sy,ex,ey : Integer);
procedure TCanvas.Chord(x1, y1, x2, y2, sx, sy, ex, ey : Integer);
begin
Changing;
RequiredState([csHandleValid, csBrushValid, csPenValid]);
LCLIntf.RadialChord(FHandle,x,y,AWidth,AHeight,sx,sy,ex,ey);
LCLIntf.RadialChord(FHandle, x1, y1, x2, y2, sx, sy, ex, ey);
Changed;
end;

24
lcl/include/intfbaselcl.inc
View File

@ -512,33 +512,33 @@ begin
end;
function TWidgetSet.RadialArc(DC: HDC;
x,y,width,height,sx,sy,ex,ey : Integer): Boolean;
left, top, right, bottom, sx, sy, ex, ey: Integer): Boolean;
var
A1, A2 : Extended;
begin
Coords2Angles(x,y,width,height,sx,sy,ex,ey,A1,A2);
Result := Arc(DC, X, Y, Width, Height, RoundToInt(A1), RoundToInt(A2));
Coords2Angles(left, top, right-left, bottom-top, sx, sy, ex, ey, A1, A2);
Result := Arc(DC, left, top, right, bottom, RoundToInt(A1), RoundToInt(A2));
end;
function TWidgetSet.RadialChord(DC: HDC;
x,y,width,height,sx,sy,ex,ey : Integer): Boolean;
x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean;
var
A1, A2 : Extended;
Begin
Coords2Angles(x,y,width,height,sx,sy,ex,ey,A1,A2);
Result := AngleChord(DC, X, Y, Width, Height, RoundToInt(A1), RoundToInt(A2));
Coords2Angles(x1, y1, x2-x1, y2-y1, sx, sy, ex, ey, A1, A2);
Result := AngleChord(DC, x1, y1, x2, y2, RoundToInt(A1), RoundToInt(A2));
End;
function TWidgetSet.RadialPie(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean;
function TWidgetSet.RadialPie(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean;
var
A1, A2 : Extended;
begin
Coords2Angles(x,y,width,height,sx,sy,ex,ey,A1,A2);
Result := RadialPieWithAngles(DC, X, Y, Width, Height,
Coords2Angles(x1, y1, x2-x1, y2-y1, sx, sy, ex, ey, A1, A2);
Result := RadialPieWithAngles(DC, x1, y1, x2, y2,
RoundToInt(A1), RoundToInt(A2));
end;
function TWidgetSet.RadialPieWithAngles(DC: HDC; X,Y,Width,Height,
function TWidgetSet.RadialPieWithAngles(DC: HDC; x1, y1, x2, y2,
Angle1, Angle2: Integer): Boolean;
var
Points : PPoint;
@ -547,10 +547,10 @@ begin
Result := False;
Points := nil;
Count := 0;
PolyBezierArcPoints(X,Y,Width,Height,Angle1, Angle2, 0, Points, Count);
PolyBezierArcPoints(x1, y1, x2 - x1, y2 - y1, Angle1, Angle2, 0, Points, Count);
Inc(Count,2);
ReallocMem(Points, Count*SizeOf(TPoint));
Points[Count - 2] := CenterPoint(Rect(X,Y,X+Width,Y+Height));
Points[Count - 2] := CenterPoint(Rect(x1, y1, x2, y2));
Points[Count - 1] := Points[0];
Polygon(DC, Points, Count, True);
ReallocMem(Points, 0);

24
lcl/include/intfbasewinapi.inc
View File

@ -28,7 +28,7 @@
//##apiwiz##sps## // Do not remove
function TWidgetSet.Arc(DC: HDC;
Left,Top,width,height,angle1,angle2 : Integer): Boolean;
Left, Top, Right, Bottom, angle1, angle2: Integer): Boolean;
var
Points : PPoint;
Count : Longint;
@ -36,14 +36,14 @@ begin
Result := False;
Points := nil;
Count := 0;
PolyBezierArcPoints(Left,Top,Width,Height,Angle1, Angle2, 0, Points, Count);
PolyBezierArcPoints(Left, Top, Right-Left, Bottom-Top, Angle1, Angle2, 0, Points, Count);
Polygon(DC, Points, Count, False);
ReallocMem(Points, 0);
Result := True;
end;
function TWidgetSet.AngleChord(DC: HDC;
x,y,width,height,angle1,angle2 : Integer): Boolean;
x1, y1, x2, y2, angle1, angle2: Integer): Boolean;
var
Points : PPoint;
Count : Longint;
@ -51,7 +51,7 @@ begin
Result := False;
Points := nil;
Count := 0;
PolyBezierArcPoints(X,Y,Width,Height,Angle1, Angle2, 0, Points, Count);
PolyBezierArcPoints(x1, y1, x2-x1, y2-y1, Angle1, Angle2, 0, Points, Count);
Inc(Count);
ReallocMem(Points, Count*SizeOf(TPoint));
Points[Count - 1] := Points[0];
@ -1196,10 +1196,10 @@ begin
Pen := SelectObject(DC, GetStockObject(NULL_PEN));
//debugln('TWidgetSet.RoundRect ',dbgs(Rect(X1,Y1,X2,Y2)),' ',dbgs(Point(RX,RY)));
RadialPieWithAngles(DC, X1, Y1, RX, RY, 90*16,90*16);
RadialPieWithAngles(DC, X2 - RX, Y1, RX, RY, 0, 90*16);
RadialPieWithAngles(DC, X1, Y2 - RY, RX, RY, 180*16,90*16);
RadialPieWithAngles(DC, X2 - RX, Y2 - RY, RX, RY, 270*16,90*16);
RadialPieWithAngles(DC, X1, Y1, X1 + RX, Y1 + RY, 90*16,90*16);
RadialPieWithAngles(DC, X2 - RX, Y1, X2, Y1 + RY, 0, 90*16);
RadialPieWithAngles(DC, X1, Y2 - RY, X1 + RX, Y2, 180*16,90*16);
RadialPieWithAngles(DC, X2 - RX, Y2 - RY, X2, Y2, 270*16,90*16);
Rectangle(DC, X1 + (RX div 2) - 1, Y1, X2 - (RX div 2) + 1, Y2 + 1);
Rectangle(DC, X1, Y1 + (RY div 2) - 1, X2 + 1, Y2 - (RY div 2) + 1);
@ -1208,10 +1208,10 @@ begin
Brush := SelectObject(DC, GetStockObject(NULL_BRUSH));
Arc(DC, X1, Y1, RX, RY, 90*16,90*16);
Arc(DC, X2 - RX, Y1, RX, RY, 0, 90*16);
Arc(DC, X1, Y2 - RY, RX, RY, 180*16,90*16);
Arc(DC, X2 - RX, Y2 - RY, RX, RY, 270*16,90*16);
Arc(DC, X1, Y1, X1 + RX, Y1 + RY, 90*16,90*16);
Arc(DC, X2 - RX, Y1, X2, Y1 + RY, 0, 90*16);
Arc(DC, X1, Y2 - RY, X1 + RX, Y2, 180*16,90*16);
Arc(DC, X2 - RX, Y2 - RY, X2, Y2, 270*16,90*16);
RY := RY div 2;
RX := RX div 2;

16
lcl/include/lclintf.inc
View File

@ -362,25 +362,25 @@ begin
Result := WidgetSet.PromptUserAtXY(DialogCaption, DialogMessage, DialogType, Buttons, ButtonCount, DefaultIndex, EscapeResult, X, Y);
end;
function RadialChord(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean;
function RadialChord(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean;
begin
Result := WidgetSet.RadialChord(DC, x,y,width,height,sx,sy,ex,ey);
Result := WidgetSet.RadialChord(DC, x1, y1, x2, y2, sx, sy, ex, ey);
end;
function RadialArc(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean;
function RadialArc(DC: HDC; left, top, right, bottom, sx, sy, ex, ey: Integer): Boolean;
begin
Result := WidgetSet.RadialArc(DC, x,y,width,height,sx,sy,ex,ey);
Result := WidgetSet.RadialArc(DC, left, top, right, bottom, sx, sy, ex, ey);
end;
function RadialPie(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean;
function RadialPie(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean;
begin
Result := WidgetSet.RadialPie(DC, x,y,width,height,sx,sy,ex,ey);
Result := WidgetSet.RadialPie(DC, x1, y1, x2, y2, sx, sy, ex, ey);
end;
function RadialPieWithAngles(DC: HDC; X,Y,Width,Height,
function RadialPieWithAngles(DC: HDC; x1, y1, x2, y2,
Angle1,Angle2: Integer): Boolean;
begin
Result := WidgetSet.RadialPieWithAngles(DC, X,Y,Width,Height,Angle1,Angle2);
Result := WidgetSet.RadialPieWithAngles(DC, x1, y1, x2, y2, Angle1, Angle2);
end;
function RegroupMenuItem(hndMenu: HMENU; GroupIndex: integer) : Boolean;

8
lcl/include/lclintfh.inc
View File

@ -101,10 +101,10 @@ function PairSplitterSetPosition(SplitterHandle: hWnd; var NewPosition: integer)
function PromptUser(const DialogCaption, DialogMessage : String; DialogType : longint; Buttons : PLongint; ButtonCount, DefaultIndex, EscapeResult : Longint) : Longint;{$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function PromptUserAtXY(const DialogCaption, DialogMessage : String; DialogType : longint; Buttons : PLongint; ButtonCount, DefaultIndex, EscapeResult : Longint; X, Y : Longint) : Longint;{$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function RadialArc(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function RadialChord(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function RadialPie(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function RadialPieWithAngles(DC: HDC; X,Y,Width,Height,Angle1,Angle2: Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function RadialArc(DC: HDC; left, top, right, bottom, sx, sy, ex, ey : Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function RadialChord(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey : Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function RadialPie(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey : Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function RadialPieWithAngles(DC: HDC; x1, y1, x2, y2, Angle1, Angle2: Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function RegroupMenuItem(hndMenu: HMENU; GroupIndex: integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function ReleaseDesignerDC(hWnd: HWND; DC: HDC): Integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
procedure RemoveEventHandler(var AHandler: PEventHandler); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}

8
lcl/include/winapi.inc
View File

@ -33,14 +33,14 @@
******************************************************************************}
//##apiwiz##sps## // Do not remove
function Arc(DC: HDC; Left,Top,width,height,angle1,angle2 : Integer): Boolean;
function Arc(DC: HDC; Left, Top, Right, Bottom, angle1, angle2: Integer): Boolean;
begin
Result := WidgetSet.Arc(DC,Left,Top,width,height,angle1,angle2);
Result := WidgetSet.Arc(DC, Left, Top, Right, Bottom, angle1, angle2);
end;
function AngleChord(DC: HDC; x,y,width,height,angle1,angle2 : Integer): Boolean;
function AngleChord(DC: HDC; x1, y1, x2, y2, angle1, angle2: Integer): Boolean;
begin
Result := WidgetSet.AngleChord(DC,x,y,width,height,angle1,angle2);
Result := WidgetSet.AngleChord(DC, x1, y1, x2, y2, angle1, angle2);
end;
function BeginPaint(Handle: hWnd; Var PS : TPaintStruct) : hdc;

4
lcl/include/winapih.inc
View File

@ -38,8 +38,8 @@
******************************************************************************}
//##apiwiz##sps## // Do not remove
function Arc(DC: HDC; Left,Top,width,height,angle1,angle2 : Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function AngleChord(DC: HDC; x,y,width,height,angle1,angle2 : Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function Arc(DC: HDC; Left,Top,Right,Bottom,angle1,angle2 : Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function AngleChord(DC: HDC; x1,y1,x2,y2,angle1,angle2 : Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
Function BeginPaint(Handle : hwnd; var PS : TPaintStruct): hdc; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function BitBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSrc: Integer; Rop: DWORD): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}

20
lcl/interfaces/carbon/carbonwinapi.inc
View File

@ -28,16 +28,16 @@
//##apiwiz##sps## // Do not remove
function TCarbonWidgetSet.Arc(DC: HDC; Left,Top, width, height, angle1,
function TCarbonWidgetSet.Arc(DC: HDC; Left, Top, Right, Bottom, angle1,
angle2: Integer): Boolean;
begin
Result:=inherited Arc(DC, Left,Top, width, height, angle1, angle2);
Result:=inherited Arc(DC, Left, Top, Right, Bottom, angle1, angle2);
end;
function TCarbonWidgetSet.AngleChord(DC: HDC; x, y, width, height, angle1,
function TCarbonWidgetSet.AngleChord(DC: HDC; x1, y1, x2, y2, angle1,
angle2: Integer): Boolean;
begin
Result:=inherited AngleChord(DC, x, y, width, height, angle1, angle2);
Result:=inherited AngleChord(DC, x1, y1, x2, y2, angle1, angle2);
end;
function TCarbonWidgetSet.BeginPaint(Handle: hWnd; var PS: TPaintStruct): hdc;
@ -708,22 +708,22 @@ begin
Result:=inherited PostMessage(Handle, Msg, wParam, lParam);
end;
function TCarbonWidgetSet.RadialArc(DC: HDC; x, y, width, height, sx, sy, ex,
function TCarbonWidgetSet.RadialArc(DC: HDC; left, top, right, bottom, sx, sy, ex,
ey: Integer): Boolean;
begin
Result:=inherited RadialArc(DC, x, y, width, height, sx, sy, ex, ey);
Result:=inherited RadialArc(DC, left, top, right, bottom, sx, sy, ex, ey);
end;
function TCarbonWidgetSet.RadialChord(DC: HDC; x, y, width, height, sx, sy, ex,
function TCarbonWidgetSet.RadialChord(DC: HDC; x1, y1, x2, y2, sx, sy, ex,
ey: Integer): Boolean;
begin
Result:=inherited RadialChord(DC, x, y, width, height, sx, sy, ex, ey);
Result:=inherited RadialChord(DC, x1, y1, x2, y2, sx, sy, ex, ey);
end;
function TCarbonWidgetSet.RadialPie(DC: HDC; x, y, width, height, sx, sy, ex,
function TCarbonWidgetSet.RadialPie(DC: HDC; x1, y1, x2, y2, sx, sy, ex,
ey: Integer): Boolean;
begin
Result:=inherited RadialPie(DC, x, y, width, height, sx, sy, ex, ey);
Result:=inherited RadialPie(DC, x1, y1, x2, y2, sx, sy, ex, ey);
end;
function TCarbonWidgetSet.RealizePalette(DC: HDC): Cardinal;

10
lcl/interfaces/carbon/carbonwinapih.inc
View File

@ -27,8 +27,8 @@
//##apiwiz##sps## // Do not remove
function Arc(DC: HDC; Left,Top,width,height,angle1,angle2 : Integer): Boolean; override;
function AngleChord(DC: HDC; x,y,width,height,angle1,angle2 : Integer): Boolean; override;
function Arc(DC: HDC; Left, Top, Right, Bottom, angle1, angle2: Integer): Boolean; override;
function AngleChord(DC: HDC; x1, y1, x2, y2, angle1, angle2: Integer): Boolean; override;
function BeginPaint(Handle: hWnd; Var PS : TPaintStruct) : hdc; override;
function BitBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSrc: Integer; Rop: DWORD): Boolean; override;
@ -157,9 +157,9 @@ function Polygon(DC: HDC; Points: PPoint; NumPts: Integer; Winding: boolean): bo
function Polyline(DC: HDC; Points: PPoint; NumPts: Integer): boolean; override;
function PostMessage(Handle: HWND; Msg: Cardinal; wParam: WParam; lParam: LParam): Boolean; override;
function RadialArc(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean; override;
function RadialChord(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean; override;
function RadialPie(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean; override;
function RadialArc(DC: HDC; Left, Top, Right, Bottom, sx, sy, ex, ey: Integer): Boolean; override;
function RadialChord(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean; override;
function RadialPie(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean; override;
function RealizePalette(DC: HDC): Cardinal; override;
function Rectangle(DC: HDC; X1, Y1, X2, Y2: Integer): Boolean; override;
function RectVisible(dc : hdc; const ARect: TRect) : Boolean; override;

30
lcl/interfaces/gtk/gtkwinapi.inc
View File

@ -40,7 +40,7 @@ const
{------------------------------------------------------------------------------
Method: Arc
Params: x,y,width,height,angle1,angle2
Params: left, top, right, bottom, angle1, angle2
Returns: Nothing
Use Arc to draw an elliptically curved line with the current Pen.
@ -51,7 +51,7 @@ const
------------------------------------------------------------------------------}
function TGtkWidgetSet.Arc(DC: HDC;
Left,Top,width,height,angle1,angle2 : Integer): Boolean;
left, top, right, bottom, angle1, angle2: Integer): Boolean;
var
DCOrigin: TPoint;
begin
@ -76,7 +76,7 @@ begin
inc(Left,DCOrigin.X);
inc(Top,DCOrigin.Y);
{$IFDEF DebugGDKTraps}BeginGDKErrorTrap;{$ENDIF}
gdk_draw_arc(Drawable, GC, 0, Left,Top,Width,Height,
gdk_draw_arc(Drawable, GC, 0, left, top, right - left, bottom - top,
Angle1 shl 2, Angle2 shl 2);
{$IFDEF DebugGDKTraps}EndGDKErrorTrap;{$ENDIF}
end else
@ -87,7 +87,7 @@ end;
{------------------------------------------------------------------------------
Method: AngleChord
Params: DC,x,y,width,height,angle1,angle2
Params: DC, x1, y1, x2, y2, angle1, angle2
Returns: Nothing
Use AngleChord to draw a filled Chord-shape on the canvas. The angles angle1
@ -98,7 +98,7 @@ end;
------------------------------------------------------------------------------}
function TGtkWidgetSet.AngleChord(DC: HDC;
x,y,width,height,angle1,angle2 : Integer): Boolean;
x1, y1, x2, y2, angle1, angle2: Integer): Boolean;
begin
Result := IsValidDC(DC);
if Result
@ -110,7 +110,7 @@ begin
Result := False;
end
else
Result := Inherited AngleChord(DC, x, y, width, height, angle1, angle2);
Result := Inherited AngleChord(DC, x1, y1, x2, y2, angle1, angle2);
end;
end;
@ -7031,7 +7031,7 @@ end;
{------------------------------------------------------------------------------
Method: RadialArc
Params: DC,x,y,width,height,sx,sy,ex,ey
Params: DC, left, top, right, bottom, sx, sy, ex, ey
Returns: Nothing
Use RadialArc to draw an elliptically curved line with the current Pen. The
@ -7039,7 +7039,7 @@ end;
between which the Arc is drawn.
------------------------------------------------------------------------------}
function TGtkWidgetSet.RadialArc(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean;
function TGtkWidgetSet.RadialArc(DC: HDC; left, top, right, bottom, sx, sy, ex, ey: Integer): Boolean;
Begin
Result := IsValidDC(DC);
if Result
@ -7051,13 +7051,13 @@ Begin
Result := False;
end
else
Result := Inherited RadialArc(DC, x, y, width, height, sx,sy,ex,ey);
Result := Inherited RadialArc(DC, left, top, right, bottom, sx, sy, ex, ey);
end;
End;
{------------------------------------------------------------------------------
Method: RadialChord
Params: DC,x,y,width,height,sx,sy,ex,ey
Params: DC, x1, y1, x2, y2, sx, sy, ex, ey
Returns: Nothing
Use RadialChord to draw a filled Chord-shape on the canvas. The values sx,sy,
@ -7065,7 +7065,7 @@ End;
the bounding-Arc is drawn.
------------------------------------------------------------------------------}
function TGtkWidgetSet.RadialChord(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean;
function TGtkWidgetSet.RadialChord(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean;
begin
Result := IsValidDC(DC);
if Result
@ -7077,13 +7077,13 @@ begin
Result := False;
end
else
Result := Inherited RadialChord(DC, x, y, width, height, sx,sy,ex,ey);
Result := Inherited RadialChord(DC, x1, y1, x2, y2, sx, sy, ex, ey);
end;
End;
{------------------------------------------------------------------------------
Method: RadialPie
Params: DC,x,y,width,height,sx,sy,ex,ey
Params: DC, x1, y1, x2, y2, sx, sy, ex, ey
Returns: Nothing
Use RadialPie to draw a filled Pie-shaped Wedge on the canvas. The values
@ -7091,7 +7091,7 @@ End;
the bounding-Arc is drawn.
------------------------------------------------------------------------------}
function TGtkWidgetSet.RadialPie(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean;
function TGtkWidgetSet.RadialPie(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean;
begin
Result := IsValidDC(DC);
if Result
@ -7103,7 +7103,7 @@ begin
Result := False;
end
else
Result := Inherited RadialPie(DC, x, y, width, height, sx,sy,ex,ey);
Result := Inherited RadialPie(DC, x1, y1, x2, y2, sx, sy, ex, ey);
end;
end;

10
lcl/interfaces/gtk/gtkwinapih.inc
View File

@ -23,8 +23,8 @@
//##apiwiz##sps## // Do not remove
function Arc(DC: HDC; Left,Top,width,height,angle1,angle2 : Integer): Boolean; override;
function AngleChord(DC: HDC; x,y,width,height,angle1,angle2 : Integer): Boolean; override;
function Arc(DC: HDC; Left, top, right, bottom, angle1, angle2: Integer): Boolean; override;
function AngleChord(DC: HDC; x1 ,y1, x2, y2, angle1, angle2: Integer): Boolean; override;
function BeginPaint(Handle: hWnd; Var PS : TPaintStruct) : hdc; override;
function BitBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSrc: Integer; Rop: DWORD): Boolean; override;
@ -157,9 +157,9 @@ function Polygon(DC: HDC; Points: PPoint; NumPts: Integer; Winding: boolean): bo
function Polyline(DC: HDC; Points: PPoint; NumPts: Integer): boolean; override;
function PostMessage(Handle: HWND; Msg: Cardinal; wParam: WParam; lParam: LParam): Boolean; override;
function RadialArc(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean; override;
function RadialChord(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean; override;
function RadialPie(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean; override;
function RadialArc(DC: HDC; left, top, right, bottom, sx, sy, ex, ey: Integer): Boolean; override;
function RadialChord(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean; override;
function RadialPie(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean; override;
function RealizePalette(DC: HDC): Cardinal; override;
function Rectangle(DC: HDC; X1, Y1, X2, Y2: Integer): Boolean; override;
function RectVisible(dc : hdc; const ARect: TRect) : Boolean; override;

3
lcl/interfaces/win32/win32int.pp
View File

@ -118,6 +118,9 @@ Type
end;
{ Win32 interface-object class }
{ TWin32WidgetSet }
TWin32WidgetSet = Class(TWidgetSet)
Private
// The parent of all windows, represents the button of the taskbar

2
lcl/interfaces/win32/win32lclintf.inc
View File

@ -203,8 +203,6 @@ begin
FixedHeight := false;
FixedWidth := false;
if SizeConstraints.Control is TCustomComboBox then
FixedHeight := true;
if SizeConstraints.Control is TCustomCalendar then
begin
FixedHeight := true;

45
lcl/interfaces/win32/win32winapi.inc
View File

@ -42,10 +42,10 @@ Const
{------------------------------------------------------------------------------
Method: Arc
Params: DC - handle to device context
X - x-coordinate of bounding rectangle's upper-left corner
Y - y-coordinate of bounding rectangle's upper-left corner
Width - Width of the rectangle
Height - height of the rectangle
Left - x-coordinate of bounding rectangle's upper-left corner
Top - y-coordinate of bounding rectangle's upper-left corner
Right - x-coordinate of bounding rectangle's lower-right corner
Bottom - y-coordinate of bounding rectangle's lower-right corner
Angle1 - first angle
Angle2 - second angle
Returns: Whether the call was successful
@ -56,17 +56,17 @@ Const
counter-clockwise while negative values mean clockwise direction.
Zero degrees is at the 3'o clock position.
------------------------------------------------------------------------------}
Function TWin32WidgetSet.Arc(DC: HDC; Left,Top, Width, Height, Angle1, Angle2: Integer): Boolean;
Function TWin32WidgetSet.Arc(DC: HDC; Left, Top, Right, Bottom, Angle1, Angle2: Integer): Boolean;
var
SX, SY, EX, EY : Longint;
Begin
Angles2Coords(Left,Top, Width, Height, Angle1, Angle2, SX, SY, EX, EY);
Result := Boolean(Windows.Arc(DC, Left,Top, Left+Width, Top+Height, SX, SY, EX, EY));
Angles2Coords(Left, Top, Right - Left, Bottom - Top, Angle1, Angle2, SX, SY, EX, EY);
Result := Boolean(Windows.Arc(DC, Left, Top, Right, Bottom, SX, SY, EX, EY));
End;
{------------------------------------------------------------------------------
Method: AngleChord
Params: DC,x,y,width,height,angle1,angle2
Params: DC, x1, y1, x2, y2, angle1, angle2
Returns: Nothing
Use AngleChord to draw a filled Chord-shape on the canvas. The angles angle1
@ -76,13 +76,13 @@ End;
position.
------------------------------------------------------------------------------}
Function TWin32WidgetSet.AngleChord(DC: HDC; X, Y, Width, Height, Angle1,
Function TWin32WidgetSet.AngleChord(DC: HDC; x1, y1, x2, y2, Angle1,
Angle2: Integer): Boolean;
var
SX, SY, EX, EY : Longint;
Begin
Angles2Coords(X,Y,Width,Height,Angle1,Angle2, SX, SY, EX, EY);
Result := Boolean(Windows.Chord(DC, X, Y, X+Width, Y+Height, SX, SY, EX, EY));
Angles2Coords(x1, y1, x2-x1, y2-y1, Angle1, Angle2, SX, SY, EX, EY);
Result := Boolean(Windows.Chord(DC, x1, y1, x2, y2, SX, SY, EX, EY));
End;
{------------------------------------------------------------------------------
@ -2509,7 +2509,7 @@ End;
{------------------------------------------------------------------------------
Method: RadialArc
Params: DC,x,y,width,height,sx,sy,ex,ey
Params: DC, left, top, right, bottom, sx, sy, ex, ey
Returns: Nothing
Use RadialArc to draw an elliptically curved line with the current Pen. The
@ -2517,14 +2517,14 @@ End;
between which the Arc is drawn.
------------------------------------------------------------------------------}
function TWin32WidgetSet.RadialArc(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean;
function TWin32WidgetSet.RadialArc(DC: HDC; left, top, right, bottom, sx, sy, ex, ey: Integer): Boolean;
Begin
Result := Boolean(Windows.Arc(DC, X, Y, X+Width, Y+Height, SX, SY, EX, EY));
Result := Boolean(Windows.Arc(DC, left, top, right, bottom, sx, sy, ex, ey));
End;
{------------------------------------------------------------------------------
Method: RadialChord
Params: DC,x,y,width,height,sx,sy,ex,ey
Params: DC, x1, y1, x2, y2, sx, sy, ex, ey
Returns: Nothing
Use RadialChord to draw a filled Chord-shape on the canvas. The values sx,sy,
@ -2532,14 +2532,14 @@ End;
the bounding-Arc is drawn.
------------------------------------------------------------------------------}
function TWin32WidgetSet.RadialChord(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean;
function TWin32WidgetSet.RadialChord(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean;
Begin
Result := Boolean(Windows.Chord(DC, X, Y, X+Width, Y+Height, SX, SY, EX, EY));
Result := Boolean(Windows.Chord(DC, x1, y1, x2, y2, sx, sy, ex, ey));
End;
{------------------------------------------------------------------------------
Method: RadialPie
Params: DC,x,y,width,height,sx,sy,ex,ey
Params: DC, x1, y1, x2, y2, sx, sy, ex, ey
Returns: Nothing
Use RadialPie to draw a filled Pie-shaped Wedge on the canvas. The values
@ -2547,9 +2547,9 @@ End;
the bounding-Arc is drawn.
------------------------------------------------------------------------------}
function TWin32WidgetSet.RadialPie(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean;
function TWin32WidgetSet.RadialPie(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean;
Begin
Result := Boolean(Windows.Pie(DC, X, Y, X+Width, Y+Height, SX, SY, EX, EY));
Result := Boolean(Windows.Pie(DC, x1, y1, x2, y2, sx, sy, ex, ey));
End;
{------------------------------------------------------------------------------
@ -2879,6 +2879,11 @@ Begin
Result := Windows.SetCaretPos(X, Y);
End;
function TWin32WidgetSet.SetCursor(hCursor: HICON): HCURSOR;
begin
Result := Windows.SetCursor(Windows.LoadCursor(0, LclCursorToWin32CursorMap[hCursor]));
end;
{------------------------------------------------------------------------------
Function: SetCursorPos
Params: X:

11
lcl/interfaces/win32/win32winapih.inc
View File

@ -22,8 +22,8 @@
}
//##apiwiz##sps## // Do not remove
function Arc(DC: HDC; Left,Top, Width, Height, Angle1, Angle2: Integer): Boolean; Override;
function AngleChord(DC: HDC; x,y,width,height,angle1,angle2 : Integer): Boolean; override;
function Arc(DC: HDC; Left,Top, Right, Bottom, Angle1, Angle2: Integer): Boolean; Override;
function AngleChord(DC: HDC; x1, y1, x2, y2, angle1, angle2: Integer): Boolean; override;
function BeginPaint(Handle : hwnd; var PS : TPaintStruct): hdc; Override;
function BitBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSrc: Integer; Rop: DWORD): Boolean; Override;
@ -144,9 +144,9 @@ function Polygon(DC: HDC; Points: PPoint; NumPts: Integer; Winding: Boolean): Bo
function Polyline(DC: HDC; Points: PPoint; NumPts: Integer): Boolean; Override;
function PostMessage(Handle: HWND; Msg: Cardinal; WParam: WParam; LParam: LParam): Boolean; Override;
function RadialArc(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean; override;
function RadialChord(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean; override;
function RadialPie(DC: HDC; x,y,width,height,sx,sy,ex,ey : Integer): Boolean; override;
function RadialArc(DC: HDC; left, top, right, bottom, sx, sy, ex, ey: Integer): Boolean; override;
function RadialChord(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean; override;
function RadialPie(DC: HDC; x1, y1, x2, y2, sx, sy, ex, ey: Integer): Boolean; override;
function RealizePalette(DC: HDC): Cardinal; Override;
function Rectangle(DC: HDC; X1, Y1, X2, Y2: Integer): Boolean; Override;
function RectVisible(dc : hdc; const ARect: TRect) : Boolean; Override;
@ -172,6 +172,7 @@ function SetCaretPos(X, Y: Integer): Boolean; Override;
function SetCaretPosEx(Handle: HWnd; X, Y: Integer): Boolean; Override;
// SetCaretRespondToFocus is a hack for GTK where sometimes focus seems to be lost, but isn't
//function SetCaretRespondToFocus(Handle: HWND; ShowHideOnFocus: Boolean): Boolean; Override;
function SetCursor(hCursor: HICON): HCURSOR; override;
function SetCursorPos(X, Y: Integer): Boolean; override;
function SetFocus(HWnd: HWND): HWND; Override;
function SetForegroundWindow(HWnd: HWND): boolean; override;

36
lcl/postscriptcanvas.pas
View File

@ -118,8 +118,8 @@ Type
procedure Ellipse(x1, y1, x2, y2: Integer); override;
procedure Arc(Left,Top,Right,Bottom,angle1,angle2: Integer); override;
procedure RadialPie(Left,Top,AWidth,AHeight,angle1,angle2: Integer); override;
procedure Chord(x, y, AWidth, AHeight, angle1, angle2: Integer); override;
procedure RadialPie(Left,Top,Right,Bottom,angle1,angle2: Integer); override;
procedure Chord(x1, y1, x2, y2, angle1, angle2: Integer); override;
procedure TextOut(X,Y: Integer; const Text: String); override;
function TextExtent(const Text: string): TSize; override;
@ -136,10 +136,10 @@ Type
//** Methods not implemented
procedure Arc(x,y,Right,Bottom,SX,SY,EX,EY: Integer); override;
procedure Chord(x, y, AWidth, AHeight, SX, SY, EX, EY: Integer); override;
procedure Chord(x1, y1, x2, y2, SX, SY, EX, EY: Integer); override;
procedure Frame3d(var ARect: TRect; const FrameWidth: integer;
const Style: TGraphicsBevelCut); override;
procedure RadialPie(x,y,AWidth,AHeight,sx,sy,ex,ey: Integer); override;
procedure RadialPie(x1,y1,x2,y2,sx,sy,ex,ey: Integer); override;
procedure Pie(EllipseX1,EllipseY1,EllipseX2,EllipseY2,
StartX,StartY,EndX,EndY: Integer); override;
procedure TextRect(ARect: TRect; X, Y: integer; const Text: string;
@ -1614,7 +1614,7 @@ begin
Changed;
end;
procedure TPostscriptPrinterCanvas.RadialPie(Left,Top, AWidth, AHeight, angle1,
procedure TPostscriptPrinterCanvas.RadialPie(Left, Top, Right, Bottom, angle1,
angle2: Integer);
var xScale : Real;
yScale : Real;
@ -1626,14 +1626,14 @@ begin
Changing;
RequiredState([csHandleValid, csBrushValid, csPenValid]);
writecomment(Format('RadialPie(%d,%d,%d,%d,%d,%d)',[Left,Top,AWidth,AHeight,Angle1,Angle2]));
writecomment(Format('RadialPie(%d,%d,%d,%d,%d,%d)',[Left,Top,Right-Left,Bottom-Top,Angle1,Angle2]));
TranslateCoord(Left,Top);
//calculate centre of ellipse
cx:=Left;
cy:=Top;
rx:=AWidth;
ry:=AHeight;
rx:=Right-Left;
ry:=Bottom-Top;
if Angle2>=0 then
Ang:='arc'
@ -1786,13 +1786,13 @@ begin
Changed;
end;
procedure TPostscriptPrinterCanvas.Arc(x, y, Right,Bottom, SX, SY, EX,
procedure TPostscriptPrinterCanvas.Arc(x, y, Right, Bottom, SX, SY, EX,
EY: Integer);
begin
//Not implemented
end;
procedure TPostscriptPrinterCanvas.Chord(x, y, AWidth, AHeight, angle1,angle2: Integer);
procedure TPostscriptPrinterCanvas.Chord(x1, y1, x2, y2, angle1,angle2: Integer);
var xScale : Real;
yScale : Real;
cX, cY : Real;
@ -1803,14 +1803,14 @@ begin
Changing;
RequiredState([csHandleValid, csBrushValid, csPenValid]);
writecomment(Format('Chord(%d,%d,%d,%d,%d,%d)',[x,y,AWidth,AHeight,Angle1,Angle2]));
TranslateCoord(X,Y);
writecomment(Format('Chord(%d,%d,%d,%d,%d,%d)',[x1,y1,x2-x1,y2-y1,Angle1,Angle2]));
TranslateCoord(x1, y1);
//calculate centre of ellipse
cx:=x;
cy:=y;
rx:=AWidth;
ry:=AHeight;
cx:=x1;
cy:=y1;
rx:=x2-x1;
ry:=y2-y1;
if Angle2>=0 then
Ang:='arc'
@ -1837,7 +1837,7 @@ begin
Changed;
end;
procedure TPostscriptPrinterCanvas.Chord(x, y, AWidth, AHeight, SX, SY, EX, EY: Integer);
procedure TPostscriptPrinterCanvas.Chord(x1, y1, x2, y2, SX, SY, EX, EY: Integer);
begin
//Not implemented
end;
@ -1848,7 +1848,7 @@ begin
//Not implemented
end;
procedure TPostscriptPrinterCanvas.RadialPie(x, y, AWidth, AHeight, sx, sy, ex,
procedure TPostscriptPrinterCanvas.RadialPie(x1, y1, x2, y2, sx, sy, ex,
ey: Integer);
begin
//Not implemented