gtk2: formatting

git-svn-id: trunk@29710 -
This commit is contained in:
paul 2011-03-03 07:32:07 +00:00
parent 252f0f5bac
commit bab4aa9c08
2 changed files with 7 additions and 7 deletions

View File

@ -864,7 +864,7 @@ begin
// ' Clip=',DbgS(Clip),8),' RGn=',DbgS(Cardinal(RGN),' Mode=',dbgs(Mode)); // ' Clip=',DbgS(Clip),8),' RGn=',DbgS(Cardinal(RGN),' Mode=',dbgs(Mode));
Result := CombineRGN(Clip, OldC, RGN, Mode); Result := CombineRGN(Clip, OldC, RGN, Mode);
//DebugLn('TWidgetSet.ExtSelectClipRGN B Result=',Result); //DebugLn('TWidgetSet.ExtSelectClipRGN B Result=',Result);
If Result <> ERROR then if Result <> ERROR then
Result := SelectClipRGN(DC, Clip); Result := SelectClipRGN(DC, Clip);
DeleteObject(Clip); DeleteObject(Clip);
DeleteObject(OldC); DeleteObject(OldC);
@ -1192,7 +1192,7 @@ begin
RRGN := CreateRectRgn(Left, Top, Right, Bottom); RRGN := CreateRectRgn(Left, Top, Right, Bottom);
//DebugLn('TWidgetSet.IntersectClipRect A RGN=',DbgS(RRGN), //DebugLn('TWidgetSet.IntersectClipRect A RGN=',DbgS(RRGN),
// ' ',dbgs(Left),',',dbgs(Top),',',dbgs(Right),',',dbgs(Bottom)); // ' ',dbgs(Left),',',dbgs(Top),',',dbgs(Right),',',dbgs(Bottom));
If not DCClipRegionValid(DC) then if not DCClipRegionValid(DC) then
Result := SelectClipRGN(DC, RRGN) Result := SelectClipRGN(DC, RRGN)
else else
Result := ExtSelectClipRGN(DC, RRGN, RGN_AND); Result := ExtSelectClipRGN(DC, RRGN, RGN_AND);

View File

@ -1774,7 +1774,7 @@ begin
S2Obj := PGdiObject(Src2); S2Obj := PGdiObject(Src2);
Continue := IsValidGDIObject(Dest) and IsValidGDIObject(Src1) Continue := IsValidGDIObject(Dest) and IsValidGDIObject(Src1)
and IsValidGDIObject(Src2); and IsValidGDIObject(Src2);
If Not Continue then begin if not Continue then begin
DebugLn('WARNING: [TGtk2WidgetSet.CombineRgn] Invalid HRGN'); DebugLn('WARNING: [TGtk2WidgetSet.CombineRgn] Invalid HRGN');
Result := Error; Result := Error;
end end
@ -1782,7 +1782,7 @@ begin
S1 := S1Obj^.GDIRegionObject; S1 := S1Obj^.GDIRegionObject;
S2 := S2Obj^.GDIRegionObject; S2 := S2Obj^.GDIRegionObject;
//DebugLn('TGtk2WidgetSet.CombineRgn A fnCombineMode=',Dbgs(fnCombineMode)); //DebugLn('TGtk2WidgetSet.CombineRgn A fnCombineMode=',Dbgs(fnCombineMode));
Case fnCombineMode of case fnCombineMode of
RGN_AND : RGN_AND :
D := PGDKRegion(gdk_region_intersect(S1, S2)); D := PGDKRegion(gdk_region_intersect(S1, S2));
RGN_COPY : RGN_COPY :
@ -3325,15 +3325,15 @@ var
DCOrigin: TPoint; DCOrigin: TPoint;
begin begin
Result := SIMPLEREGION; Result := SIMPLEREGION;
If not IsValidDC(DC) then if not IsValidDC(DC) then
Result := ERROR Result := ERROR
else with TGtkDeviceContext(DC) do else with TGtkDeviceContext(DC) do
begin begin
//DebugLn('TGtk2WidgetSet.ExtSelectClipRGN A ClipRegValid=',dbgs(DCClipRegionValid(DC)), //DebugLn('TGtk2WidgetSet.ExtSelectClipRGN A ClipRegValid=',dbgs(DCClipRegionValid(DC)),
// ' Mode=',dbgs(Mode),' RGN=',GDKRegionAsString(PGdiObject(RGN)^.GDIRegionObject)); // ' Mode=',dbgs(Mode),' RGN=',GDKRegionAsString(PGdiObject(RGN)^.GDIRegionObject));
If ClipRegion=nil then begin if ClipRegion=nil then begin
// there is no clipping region in the DC // there is no clipping region in the DC
Case Mode of case Mode of
RGN_COPY: RGN_COPY:
begin begin
Result := RegionType(PGdiObject(RGN)^.GDIRegionObject); Result := RegionType(PGdiObject(RGN)^.GDIRegionObject);