paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-16 21:48:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtk2: fix FrameRect - it must use a passed brush instead of selected one

Browse Source 
git-svn-id: trunk@38747 -
This commit is contained in:
paul 2012-09-19 09:22:23 +00:00
parent e211eafca1
commit edc52f2857
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4070,6 +4070,7 @@ var
DevCtx: TGtkDeviceContext absolute DC; DevCtx: TGtkDeviceContext absolute DC;
DCOrigin: TPoint; DCOrigin: TPoint;
R: TRect; R: TRect;
OldBrush: HBrush;
begin begin
Result:=0; Result:=0;
if not IsValidDC(DC) then Exit; if not IsValidDC(DC) then Exit;
@ -4079,7 +4080,8 @@ begin
Result := 1; Result := 1;
if {%H-}PGdiObject(hBr)^.IsNullBrush then Exit; if {%H-}PGdiObject(hBr)^.IsNullBrush then Exit;
DevCtx.SelectedColors:= dcscCustom; OldBrush := SelectObject(DC, hBr);
DevCtx.SelectedColors := dcscCustom;
EnsureGCColor(DC, dccGDIBrushColor, True, False);//Brush Color EnsureGCColor(DC, dccGDIBrushColor, True, False);//Brush Color
R := ARect; R := ARect;
@ -4089,6 +4091,7 @@ begin
gdk_draw_rectangle(DevCtx.Drawable, DevCtx.GC, 0, gdk_draw_rectangle(DevCtx.Drawable, DevCtx.GC, 0,
R.Left + DCOrigin.X, R.Top + DCOrigin.Y, R.Left + DCOrigin.X, R.Top + DCOrigin.Y,
R.Right-R.Left-1, R.Bottom-R.Top-1); R.Right-R.Left-1, R.Bottom-R.Top-1);
SelectObject(DC, OldBrush);
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------