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

clean up

Browse Source 
git-svn-id: trunk@4349 -
This commit is contained in:
mattias 2003-07-01 13:49:36 +00:00
parent d86c28d794
commit c1f3f8d899
4 changed files with 72 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/graphtype.pp
View File

@ -156,6 +156,7 @@ type
TBevelCut = (bvNone, bvLowered, bvRaised);
{ For Delphi compatibility }
TPixelFormat = (
pfDevice,
pf1bit,
@ -224,7 +225,7 @@ type
BlueShift: cardinal;
AlphaPrec: cardinal;
AlphaShift: cardinal;
// The next values are only valid if there is a separate alpha mask
// The next values are only valid, if there is a separate alpha mask
AlphaBitsPerPixel: cardinal; // bits per alpha mask pixel.
AlphaLineEnd: TRawImageLineEnd;
end;
@ -237,6 +238,9 @@ end.
{ =============================================================================
$Log$
Revision 1.13 2003/07/01 13:49:36 mattias
clean up
Revision 1.12 2003/07/01 09:29:51 mattias
attaching menuitems topdown

14
lcl/include/customform.inc
View File

@ -418,16 +418,7 @@ end;
procedure TCustomForm.WMPaint(var Message: TLMPaint);
begin
//writeln('[TCustomForm.WMPaint] ',Name,':',ClassName);
Assert(False, Format('Trace: [TCustomForm.LMPaint] %s', [ClassName]));
Include(FControlState, csCustomPaint);
try
ControlState := ControlState + [csCustomPaint];
inherited WMPaint(Message);
ControlState := ControlState - [csCustomPaint];
finally
Exclude(FControlState, csCustomPaint);
end;
inherited WMPaint(Message);
//writeln('[TCustomForm.WMPaint] END ',Name,':',ClassName);
end;
@ -1432,6 +1423,9 @@ end;
{ =============================================================================
$Log$
Revision 1.108 2003/07/01 13:49:36 mattias
clean up
Revision 1.107 2003/06/30 07:00:18 mattias
activated EraseBckGrd messages in doublebuffer WMPaint section

2
lcl/include/scrollingwincontrol.inc
View File

@ -66,9 +66,7 @@ procedure TScrollingWinControl.WMPaint(var Message: TLMPaint);
begin
Include(FControlState, csCustomPaint);
try
ControlState := ControlState + [csCustomPaint];
inherited WMPaint(Message);
ControlState := ControlState - [csCustomPaint];
finally
Exclude(FControlState, csCustomPaint);
end;

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

@ -3919,8 +3919,14 @@ function TgtkObject.GetDeviceRawImageDescription(DC: HDC;
var
Visual: PGdkVisual;
Width, Height: integer;
Image: PGdkImage;
begin
Result := false;
if Desc=nil then begin
RaiseGDBException('TgtkObject.GetDeviceRawImageDescription');
exit;
end;
Visual:=nil;
If IsValidDC(DC) then
with TDeviceContext(DC) do begin
@ -3934,11 +3940,10 @@ begin
end;
FillChar(Desc,SizeOf(TRawImageDescription),0);
FillChar(Desc^,SizeOf(TRawImageDescription),0);
// Format
case Visual^.thetype of
GDK_VISUAL_STATIC_GRAY: Desc^.Format:=ricfGray;
GDK_VISUAL_GRAYSCALE: Desc^.Format:=ricfPalette;
GDK_VISUAL_STATIC_COLOR: Desc^.Format:=ricfPalette;
@ -3965,9 +3970,19 @@ begin
// ColorCount
Desc^.ColorCount:=0;
// BitsPerPixel
Desc^.BitsPerPixel:=Visual^.bits_per_rgb;
case Desc^.Depth of
0..8: Desc^.BitsPerPixel:=8;
9..16: Desc^.BitsPerPixel:=16;
17..32: Desc^.BitsPerPixel:=32;
else Desc^.BitsPerPixel:=64;
end;
// LineEnd
Desc^.LineEnd:=rileByteBoundary;
case Desc^.Depth of
0..8: Desc^.LineEnd:=rileByteBoundary;
9..16: Desc^.LineEnd:=rileWordBoundary;
17..32: Desc^.LineEnd:=rileDWordBoundary;
else Desc^.LineEnd:=rileQWordBoundary;
end;
// Precisions and Shifts
Desc^.RedPrec:=Visual^.red_prec;
Desc^.RedShift:=Visual^.red_shift;
@ -3979,8 +3994,47 @@ begin
Desc^.AlphaShift:=0;
// AlphaBitsPerPixel and AlphaLineEnd
Desc^.AlphaBitsPerPixel:=Desc^.AlphaPrec;
Desc^.AlphaLineEnd:=rileByteBoundary;
Desc^.AlphaLineEnd:=rileDWordBoundary;
with Desc^ do begin
writeln('TgtkObject.GetDeviceRawImageDescription A ',
' Format=',ord(Format),
' Depth=',Depth,
' Width=',Width,
' Height=',Height,
' ByteOrder=',ord(ByteOrder),
' LineOrder=',ord(LineOrder),
' ColorCount=',ColorCount,
' BitsPerPixel=',BitsPerPixel,
' LineEnd=',ord(LineEnd),
' RedPrec=',RedPrec,
' RedShift=',RedShift,
' GreenPrec=',GreenPrec,
' GreenShift=',GreenShift,
' BluePrec=',BluePrec,
' BlueShift=',BlueShift,
' AlphaPrec=',AlphaPrec,
' AlphaShift=',AlphaShift,
' AlphaBitsPerPixel=',AlphaBitsPerPixel,
' AlphaLineEnd=',ord(AlphaLineEnd),
'');
end;
If IsValidDC(DC) then
If TDeviceContext(DC).Drawable <> nil then begin
Image:=gdk_image_get(PGdkWindow(TDeviceContext(DC).Drawable),0,0,10,10);
with Image^ do begin
writeln('TgtkObject.GetDeviceRawImageDescription B ',
' byte_order=',byte_order,
' width=',width,
' height=',height,
' depth=',depth,
' bpp=',bpp,
' bpl=',bpl,
'');
end;
end;
Result:=true;
end;
@ -8589,6 +8643,9 @@ end;
{ =============================================================================
$Log$
Revision 1.254 2003/07/01 13:49:36 mattias
clean up
Revision 1.253 2003/07/01 09:29:51 mattias
attaching menuitems topdown