paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 11:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtk2: rename TGtkDeviceContext.Origin to WindowOrg to be consistent with ViewPortOrg and WindowExt

Browse Source 
git-svn-id: trunk@38728 -
This commit is contained in:
paul 2012-09-18 03:48:07 +00:00
parent 6d6ec57e0a
commit 272eb740df
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/interfaces/gtk2/gtk2def.pp
View File

@ -279,7 +279,6 @@ type
FWidget: PGtkWidget; // the owner (in case of a windowDC)
FWithChildWindows: boolean;// this DC covers sub gdkwindows
FOrigin: TPoint;
FFlags: TDeviceContextsFlags;
FSelectedColors: TDevContextSelectedColorsType;
@ -291,6 +290,7 @@ type
FViewPortExt: TPoint; // current viewport extent
FViewPortOrg: TPoint; // current viewport origin
FWindowExt: TPoint; // current window extent
FWindowOrg: TPoint; // current window origin
function GetClipRectangle: TGdkRectangle;
function GetGDIObjects(ID: TGDIType): PGdiObject;
@ -388,7 +388,6 @@ type
function FillRect(ARect: TRect; ABrush: HBrush; SkipRop: Boolean): Boolean;
// origins
property Origin: TPoint read FOrigin write FOrigin;
property Offset: TPoint read GetOffset;
// drawing settings
property CurrentBitmap: PGdiObject read FCurrentBitmap write SetCurrentBitmap;
@ -406,6 +405,7 @@ type
property ViewPortExt: TPoint read FViewPortExt write SetViewPortExt;
property ViewPortOrg: TPoint read FViewPortOrg write SetViewPortOrg;
property WindowExt: TPoint read FWindowExt write SetWindowExt;
property WindowOrg: TPoint read FWindowOrg write FWindowOrg;
// control
property SelectedColors: TDevContextSelectedColorsType read FSelectedColors write SetSelectedColors;
property Flags: TDeviceContextsFlags read FFlags write FFlags;

14
lcl/interfaces/gtk2/gtk2devicecontext.inc
View File

@ -77,7 +77,7 @@ begin
Exit;
end;
Result := FOrigin;
Result := WindowOrg;
if Assigned(FWidget) then
begin
Fixed := GetFixedWidget(FWidget);
@ -569,6 +569,7 @@ begin
FViewPortExt := Point(1, 1);
FViewPortOrg := Point(0, 0);
FWindowExt := Point(1, 1);
FWindowOrg := Point(0, 0);
FMapMode := MM_TEXT;
if FHasTransf then
begin
@ -577,11 +578,7 @@ begin
TransfUpdatePen;
end;
FOrigin.X := 0;
FOrigin.Y := 0;
PenPos.X := 0;
PenPos.Y := 0;
PenPos := Point(0, 0);
CurrentBitmap:=nil;
CurrentFont:=nil;
@ -661,9 +658,6 @@ begin
Exclude(FFlags, dcfPenSelected);
end;
FOrigin := ASource.FOrigin;
PenPos := ASource.PenPos;
if dcfTextMetricsValid in ASource.Flags then
begin
Include(FFlags, dcfTextMetricsValid);
@ -698,6 +692,8 @@ begin
CopyGDIColor(ASource.CurrentBackColor, CurrentBackColor);
SelectedColors := dcscCustom;
FWindowOrg := ASource.FWindowOrg;
PenPos := ASource.PenPos;
if FHasTransf then
begin

4
lcl/interfaces/gtk2/gtk2winapi.inc
View File

@ -6865,10 +6865,10 @@ begin
if Result then
with TGtkDeviceContext(DC) do
begin
NewOrigin := Origin;
NewOrigin := WindowOrg;
inc(NewOrigin.X, dX);
inc(NewOrigin.Y, dY);
Origin := NewOrigin;
WindowOrg := NewOrigin;
end;
end;