mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-11 18:58:17 +02:00
clean ups
git-svn-id: trunk@3774 -
This commit is contained in:
parent
0d883f89b8
commit
8a39b9a4b9
@ -65,6 +65,8 @@ type
|
||||
property OnPaint: TNotifyEvent read FOnPaint write FOnPaint;
|
||||
public
|
||||
procedure Paint; override;
|
||||
procedure CreateWnd; override;
|
||||
procedure DestroyWnd; override;
|
||||
end;
|
||||
|
||||
T32ScrollBar = Class(TScrollBar) {a 32 bit scrollbar}
|
||||
@ -2724,16 +2726,12 @@ var
|
||||
ABitmap: HBitmap;
|
||||
ARect: TRect;
|
||||
OldPal: HPalette;
|
||||
p: TPoint;
|
||||
begin
|
||||
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.FillRect(Rect(0,0,200,200));
|
||||
exit;
|
||||
|
||||
ThtmlLite(FViewer).DrawBorder;
|
||||
OldPal := 0;
|
||||
Canvas.Font := Font;
|
||||
@ -2757,10 +2755,8 @@ try
|
||||
SetWindowOrgEx(memDC, Left, Top, Nil);
|
||||
Canvas2.Handle := MemDC;
|
||||
{$ENDIF}
|
||||
//DoBackground(Canvas2, False);
|
||||
Canvas2.Brush.Color:=clBlue;
|
||||
Canvas2.FillRect(Rect(0,0,200,200));
|
||||
//if Assigned(FOnPaint) then FOnPaint(Self);
|
||||
DoBackground(Canvas2, False);
|
||||
if Assigned(FOnPaint) then FOnPaint(Self);
|
||||
{$IFDEF HL_LAZARUS}
|
||||
{$ELSE}
|
||||
OldPal := SelectPalette(Canvas.Handle, ThePalette, False);
|
||||
@ -2786,6 +2782,18 @@ writeln('TPaintPanel.Paint B Canvas.Handle=',HexStr(Cardinal(Canvas.Handle),8));
|
||||
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);
|
||||
var
|
||||
Bitmap, Mask: TBitmap;
|
||||
|
@ -937,7 +937,7 @@ var
|
||||
F: TSynBaseCompletionForm;
|
||||
Value, CurLine: string;
|
||||
{$IFDEF SYN_LAZARUS}
|
||||
NewCaretXY: TPoint;
|
||||
NewCaretXY, NewBlockBegin: TPoint;
|
||||
{$Else}
|
||||
Pos: TPoint;
|
||||
{$ENDIF}
|
||||
@ -946,8 +946,13 @@ begin
|
||||
if F.CurrentEditor <> nil then
|
||||
with F.CurrentEditor as TCustomSynEdit do begin
|
||||
BeginUndoBlock;
|
||||
BlockBegin := Point(CaretX - length(CurrentString), CaretY);
|
||||
{$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
|
||||
// replace only prefix
|
||||
BlockEnd := Point(CaretX, CaretY);
|
||||
@ -961,6 +966,7 @@ begin
|
||||
BlockEnd := NewCaretXY;
|
||||
end;
|
||||
{$ELSE}
|
||||
BlockBegin := Point(CaretX - length(CurrentString), CaretY);
|
||||
BlockEnd := Point(CaretX, CaretY);
|
||||
{$ENDIF}
|
||||
if Position>=0 then begin
|
||||
|
Loading…
Reference in New Issue
Block a user