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

formatting

Browse Source 
git-svn-id: trunk@18824 -
This commit is contained in:
paul 2009-02-26 02:04:33 +00:00
parent 85a175e084
commit 8c52991db1
4 changed files with 18 additions and 16 deletions

2
lcl/include/customcontrol.inc
View File

@ -120,7 +120,7 @@ procedure TCustomControl.PaintWindow(DC: HDC);
var
DCChanged: boolean;
begin
DCChanged:=(not FCanvas.HandleAllocated) or (FCanvas.Handle<>DC);
DCChanged := (not FCanvas.HandleAllocated) or (FCanvas.Handle <> DC);
if DCChanged then
FCanvas.Handle := DC;
try

8
lcl/include/custompanel.inc
View File

@ -27,7 +27,7 @@
{------------------------------------------------------------------------------
constructor TCustomPanel.Create (TheOwner : TComponent);
------------------------------------------------------------------------------}
constructor TCustomPanel.Create (TheOwner : TComponent);
constructor TCustomPanel.Create(TheOwner : TComponent);
begin
inherited Create (TheOwner);
FCompStyle:= csPanel;
@ -39,9 +39,9 @@ begin
FBevelInner := bvNone;
FBevelWidth := 1;
FAlignment := taCenter;
FFullRepaint := true;
Color:=clBtnFace;// clBackground;
SetInitialBounds(0,0,GetControlClassDefaultSize.X,GetControlClassDefaultSize.Y);
FFullRepaint := True;
Color := clBtnFace;
SetInitialBounds(0, 0, GetControlClassDefaultSize.X, GetControlClassDefaultSize.Y);
ParentColor := True;
UseDockManager := True;
end;

15
lcl/interfaces/gtk/gtkwinapiwindow.pp
View File

@ -374,17 +374,18 @@ function GTKAPIWidgetClient_Timer(Client: Pointer): GTKEventResult; cdecl;
var
WClient: PGTKAPIWidgetClient;
begin
WClient:=PGTKAPIWidgetClient(Client);
if WClient^.Caret.Timer<=0 then begin
Result := gtk_False;
WClient := PGTKAPIWidgetClient(Client);
if WClient^.Caret.Timer <= 0 then
begin
Result := gtk_false;
exit;
end;
WClient^.Caret.BlinkHide:=not WClient^.Caret.BlinkHide;
WClient^.Caret.BlinkHide := not WClient^.Caret.BlinkHide;
GTKAPIWidgetClient_DrawCaret(Client,true);
if WClient^.Caret.Timer<>0 then
Result := gtk_True
if WClient^.Caret.Timer <> 0 then
Result := gtk_true
else
Result := gtk_False;
Result := gtk_false;
end;
procedure GTKAPIWidgetClient_Realize(AWidget: PGTKWidget); cdecl;

9
lcl/interfaces/gtk/gtkwscontrols.pp
View File

@ -501,12 +501,13 @@ begin
if not WSCheckHandleAllocated(AWinControl, 'SetColor')
then Exit;
if ((csOpaque in AWinControl.ControlStyle)
and GtkWidgetIsA(pGtkWidget(AWinControl.handle),GTKAPIWidget_GetType)) then
exit;
if ((csOpaque in AWinControl.ControlStyle) and
GtkWidgetIsA(pGtkWidget(AWinControl.handle),GTKAPIWidget_GetType)) then
Exit;
//DebugLn('TGtkWSWinControl.SetColor ',DbgSName(AWinControl));
GtkWidgetSet.SetWidgetColor(pGtkWidget(AWinControl.handle),
AWinControl.font.color, AWinControl.color,
AWinControl.Font.Color, AWinControl.Color,
[GTK_STATE_NORMAL,GTK_STATE_ACTIVE,
GTK_STATE_PRELIGHT,GTK_STATE_SELECTED]);
// GtkWidgetSet.setWidgetFont(pGtkWidget(AWinControl.handle),aWinControl.font);