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

clean ups

Browse Source 
git-svn-id: trunk@3774 -
This commit is contained in:
mattias 2003-01-01 12:38:53 +00:00
parent 0d883f89b8
commit 8a39b9a4b9
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/htmllite/htmllite.pas
View File

@ -65,6 +65,8 @@ type
property OnPaint: TNotifyEvent read FOnPaint write FOnPaint; property OnPaint: TNotifyEvent read FOnPaint write FOnPaint;
public public
procedure Paint; override; procedure Paint; override;
procedure CreateWnd; override;
procedure DestroyWnd; override;
end; end;
T32ScrollBar = Class(TScrollBar) {a 32 bit scrollbar} T32ScrollBar = Class(TScrollBar) {a 32 bit scrollbar}
@ -2724,16 +2726,12 @@ var
ABitmap: HBitmap; ABitmap: HBitmap;
ARect: TRect; ARect: TRect;
OldPal: HPalette; OldPal: HPalette;
p: TPoint;
begin begin
if (FViewer as ThtmlLite).DontDraw then Exit; if (FViewer as ThtmlLite).DontDraw then Exit;
GetWindowOrgEx(Canvas.Handle,@p);
writeln('TPaintPanel.PaintA Canvas.Handle=',HexStr(Cardinal(Canvas.Handle),8),
' ',Width,',',Height,' ',ClientWidth,',',ClientHeight,' ',
' ',p.x,',',p.y,' ',Visible);
Canvas.Brush.Color:=clGreen; Canvas.Brush.Color:=clGreen;
Canvas.FillRect(Rect(0,0,200,200)); Canvas.FillRect(Rect(0,0,200,200));
exit;
ThtmlLite(FViewer).DrawBorder; ThtmlLite(FViewer).DrawBorder;
OldPal := 0; OldPal := 0;
Canvas.Font := Font; Canvas.Font := Font;
@ -2757,10 +2755,8 @@ try
SetWindowOrgEx(memDC, Left, Top, Nil); SetWindowOrgEx(memDC, Left, Top, Nil);
Canvas2.Handle := MemDC; Canvas2.Handle := MemDC;
{$ENDIF} {$ENDIF}
//DoBackground(Canvas2, False); DoBackground(Canvas2, False);
Canvas2.Brush.Color:=clBlue; if Assigned(FOnPaint) then FOnPaint(Self);
Canvas2.FillRect(Rect(0,0,200,200));
//if Assigned(FOnPaint) then FOnPaint(Self);
{$IFDEF HL_LAZARUS} {$IFDEF HL_LAZARUS}
{$ELSE} {$ELSE}
OldPal := SelectPalette(Canvas.Handle, ThePalette, False); OldPal := SelectPalette(Canvas.Handle, ThePalette, False);
@ -2786,6 +2782,18 @@ writeln('TPaintPanel.Paint B Canvas.Handle=',HexStr(Cardinal(Canvas.Handle),8));
end; end;
end; end;
procedure TPaintPanel.CreateWnd;
begin
inherited CreateWnd;
writeln('TPaintPanel.CreateWnd ',HexStr(Cardinal(Self),8),' ',HexStr(Cardinal(Handle),8));
end;
procedure TPaintPanel.DestroyWnd;
begin
writeln('TPaintPanel.DestroyWnd ',HexStr(Cardinal(Self),8));
inherited DestroyWnd;
end;
procedure TPaintPanel.DoBackground(ACanvas: TCanvas; WmErase: boolean); procedure TPaintPanel.DoBackground(ACanvas: TCanvas; WmErase: boolean);
var var
Bitmap, Mask: TBitmap; Bitmap, Mask: TBitmap;

10
components/synedit/syncompletion.pas
View File

@ -937,7 +937,7 @@ var
F: TSynBaseCompletionForm; F: TSynBaseCompletionForm;
Value, CurLine: string; Value, CurLine: string;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
NewCaretXY: TPoint; NewCaretXY, NewBlockBegin: TPoint;
{$Else} {$Else}
Pos: TPoint; Pos: TPoint;
{$ENDIF} {$ENDIF}
@ -946,8 +946,13 @@ begin
if F.CurrentEditor <> nil then if F.CurrentEditor <> nil then
with F.CurrentEditor as TCustomSynEdit do begin with F.CurrentEditor as TCustomSynEdit do begin
BeginUndoBlock; BeginUndoBlock;
BlockBegin := Point(CaretX - length(CurrentString), CaretY);
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
NewBlockBegin:=CaretXY;
CurLine:=TSynEditStringList(Lines).ExpandedStrings[NewBlockBegin.Y - 1];
while (NewBlockBegin.X>1)
and (CurLine[NewBlockBegin.X-1] in ['a'..'z','A'..'Z','0'..'9','_']) do
dec(NewBlockBegin.X);
BlockBegin:=NewBlockBegin;
if ssShift in Shift then begin if ssShift in Shift then begin
// replace only prefix // replace only prefix
BlockEnd := Point(CaretX, CaretY); BlockEnd := Point(CaretX, CaretY);
@ -961,6 +966,7 @@ begin
BlockEnd := NewCaretXY; BlockEnd := NewCaretXY;
end; end;
{$ELSE} {$ELSE}
BlockBegin := Point(CaretX - length(CurrentString), CaretY);
BlockEnd := Point(CaretX, CaretY); BlockEnd := Point(CaretX, CaretY);
{$ENDIF} {$ENDIF}
if Position>=0 then begin if Position>=0 then begin