pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

htmldemo should now work okay with win32/gtk2; fixes other issues too.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1407 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
macpgmr
2010-12-25 23:57:18 +00:00
parent e8fba0a729
commit a10d873557
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
components/thtmlport/package/htmlview.pas
View File

@ -639,17 +639,13 @@ BorderPanel := TPanel.Create(Self);
BorderPanel.BevelInner := bvNone; BorderPanel.BevelInner := bvNone;
BorderPanel.BevelOuter := bvNone; BorderPanel.BevelOuter := bvNone;
{$IFNDEF LCL} {$IFNDEF LCL}
BorderPanel.Ctl3D := False; BorderPanel.Ctl3D := False; //Not LCL property
{$ENDIF} BorderPanel.Align := alClient; //Interferes with GTK2 scrollbar
BorderPanel.Align := alClient; BorderPanel.ParentCtl3D := False; //Not LCL property
{$IFNDEF LCL}
BorderPanel.ParentCtl3D := False;
{$ENDIF}
{$ifdef delphi7_plus} {$ifdef delphi7_plus}
{$IFNDEF LCL} BorderPanel.ParentBackground := False; //Not LCL property
BorderPanel.ParentBackground := False;
{$ENDIF}
{$endif} {$endif}
{$ENDIF}
BorderPanel.Parent := Self; BorderPanel.Parent := Self;
@ -1147,15 +1143,19 @@ if FBorderStyle = htNone then
WFactor := 0; WFactor := 0;
PaintPanel.Top := 0; PaintPanel.Top := 0;
PaintPanel.Left := 0; PaintPanel.Left := 0;
{$IFNDEF LCL}
BorderPanel.Visible := False; BorderPanel.Visible := False;
{$ENDIF}
end end
else else
begin begin
WFactor := 1; WFactor := 1;
PaintPanel.Top := 1; PaintPanel.Top := 1;
PaintPanel.Left := 1; PaintPanel.Left := 1;
{$IFNDEF LCL}
BorderPanel.Visible := False; BorderPanel.Visible := False;
BorderPanel.Visible := True; BorderPanel.Visible := True;
{$ENDIF}
end; end;
WFactor2 := 2*WFactor; WFactor2 := 2*WFactor;
@ -4337,10 +4337,10 @@ procedure ThtmlViewer.PaintWindow(DC: HDC);
begin begin
PaintPanel.RePaint; PaintPanel.RePaint;
{$IFNDEF LCL} {$IFNDEF LCL}
BorderPanel.RePaint; //Causes endless loop for some reason on gtk2. BorderPanel.RePaint;
VScrollbar.RePaint; //
HScrollbar.RePaint; //
{$ENDIF} {$ENDIF}
VScrollbar.RePaint;
HScrollbar.RePaint;
end; end;
procedure ThtmlViewer.CopyToClipboard; procedure ThtmlViewer.CopyToClipboard;
@ -4694,11 +4694,17 @@ end;
procedure ThtmlViewer.DrawBorder; procedure ThtmlViewer.DrawBorder;
begin //Focused may not work with control on all widgetsets. begin //Focused may not work with control on all widgetsets.
if {$IFNDEF LCL}(Focused and (FBorderStyle = htFocused)) or{$ENDIF} (FBorderStyle = htSingle) if (Focused and (FBorderStyle = htFocused)) or (FBorderStyle = htSingle)
or (csDesigning in ComponentState) then or (csDesigning in ComponentState) then
{$IFNDEF LCL}
BorderPanel.BorderStyle := bsSingle BorderPanel.BorderStyle := bsSingle
else else
BorderPanel.BorderStyle := bsNone; BorderPanel.BorderStyle := bsNone;
{$ELSE}
// inherited BorderStyle := bsSingle
//else
// inherited BorderStyle := bsNone;
{$ENDIF}
end; end;
procedure ThtmlViewer.DoEnter; procedure ThtmlViewer.DoEnter;
@ -4875,7 +4881,11 @@ for I := 0 to FormControlList.count-1 do
with TFormControlObj(FormControlList.Items[I]) do with TFormControlObj(FormControlList.Items[I]) do
if Assigned(TheControl) then if Assigned(TheControl) then
TheControl.Hide; TheControl.Hide;
{$IFNDEF LCL}
BorderPanel.BorderStyle := bsNone; BorderPanel.BorderStyle := bsNone;
{$ELSE}
//inherited BorderStyle := bsNone;
{$ENDIF}
inherited Repaint; inherited Repaint;
end; end;
@ -5064,9 +5074,7 @@ var
begin begin
if FViewer.DontDraw or (Canvas2 <> Nil) then if FViewer.DontDraw or (Canvas2 <> Nil) then
Exit; Exit;
{$IFNDEF LCL} FViewer.DrawBorder;
FViewer.DrawBorder; //Causes endless loop for some reason on win32 and gtk2.
{$ENDIF}
OldPal := 0; OldPal := 0;
Canvas.Font := Font; Canvas.Font := Font;
Canvas.Brush.Color := Color; Canvas.Brush.Color := Color;