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

Compilation fix and starts TApplication.MoveFormFocusToChildren

Browse Source 
git-svn-id: trunk@34365 -
This commit is contained in:
sekelsenmat 2011-12-22 16:58:18 +00:00
parent cbb0725222
commit cbe7d6ff5f
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/forms.pp
View File

@ -1255,6 +1255,7 @@ type
FLayoutAdjustmentPolicy: TLayoutAdjustmentPolicy; FLayoutAdjustmentPolicy: TLayoutAdjustmentPolicy;
FMainFormOnTaskBar: Boolean; FMainFormOnTaskBar: Boolean;
FModalLevel: Integer; FModalLevel: Integer;
FMoveFormFocusToChildren: Boolean;
FOnGetMainFormHandle: TGetHandleEvent; FOnGetMainFormHandle: TGetHandleEvent;
FOnMessageDialogFinished: TModalDialogFinished; FOnMessageDialogFinished: TModalDialogFinished;
FOnModalBegin: TNotifyEvent; FOnModalBegin: TNotifyEvent;
@ -1485,6 +1486,7 @@ type
property MainFormHandle: HWND read GetMainFormHandle; property MainFormHandle: HWND read GetMainFormHandle;
property MainFormOnTaskBar: Boolean read FMainFormOnTaskBar write SetMainFormOnTaskBar; platform; property MainFormOnTaskBar: Boolean read FMainFormOnTaskBar write SetMainFormOnTaskBar; platform;
property ModalLevel: Integer read FModalLevel; property ModalLevel: Integer read FModalLevel;
property MoveFormFocusToChildren: Boolean read FMoveFormFocusToChildren write FMoveFormFocusToChildren default True;
property MouseControl: TControl read FMouseControl; property MouseControl: TControl read FMouseControl;
property TaskBarBehavior: TTaskBarBehavior read FTaskBarBehavior write SetTaskBarBehavior; property TaskBarBehavior: TTaskBarBehavior read FTaskBarBehavior write SetTaskBarBehavior;
property OnActionExecute: TActionEvent read FOnActionExecute write FOnActionExecute; property OnActionExecute: TActionEvent read FOnActionExecute write FOnActionExecute;

1
lcl/include/application.inc
View File

@ -108,6 +108,7 @@ begin
FHintShortPause := DefHintShortPause; FHintShortPause := DefHintShortPause;
FHintHidePause := DefHintHidePause; FHintHidePause := DefHintHidePause;
FHintHidePausePerChar := DefHintHidePausePerChar; FHintHidePausePerChar := DefHintHidePausePerChar;
FMoveFormFocusToChildren := True;
FShowHint := true; FShowHint := true;
FShowMainForm := true; FShowMainForm := true;
FRestoreStayOnTop := nil; FRestoreStayOnTop := nil;

3
lcl/include/customform.inc
View File

@ -927,7 +927,8 @@ begin
FActive := AValue; FActive := AValue;
if FActive then if FActive then
begin begin
if (ActiveControl = nil) and not (csDesigning in ComponentState) then if (ActiveControl = nil) and (not (csDesigning in ComponentState))
and Application.MoveFormFocusToChildren then
ActiveControl := FindDefaultForActiveControl; ActiveControl := FindDefaultForActiveControl;
SetWindowFocus; SetWindowFocus;
end; end;

4
lcl/interfaces/customdrawn/customdrawnint.pas
View File

@ -322,16 +322,18 @@ uses
customdrawnprivate, customdrawnprivate,
LCLMessageGlue; LCLMessageGlue;
const
{$ifdef CD_Windows} {$ifdef CD_Windows}
const
CDBackendNativeHandle = nhtWindowsHWND; CDBackendNativeHandle = nhtWindowsHWND;
{$define CD_HasNativeFormHandle} {$define CD_HasNativeFormHandle}
{$endif} {$endif}
{$ifdef CD_X11} {$ifdef CD_X11}
const
CDBackendNativeHandle = nhtX11TWindow; CDBackendNativeHandle = nhtX11TWindow;
{$define CD_HasNativeFormHandle} {$define CD_HasNativeFormHandle}
{$endif} {$endif}
{$ifdef CD_Cocoa} {$ifdef CD_Cocoa}
const
CDBackendNativeHandle = nhtCocoaNSWindow; CDBackendNativeHandle = nhtCocoaNSWindow;
{$define CD_HasNativeFormHandle} {$define CD_HasNativeFormHandle}
{$endif} {$endif}

9
lcl/lazcanvas.pas
View File

@ -630,6 +630,7 @@ procedure TLazCanvas.FillRect(X1, Y1, X2, Y2: Integer);
begin begin
FillRect (Rect(X1,Y1,X2,Y2)); FillRect (Rect(X1,Y1,X2,Y2));
end; end;
{$endif}
procedure TLazCanvas.FillColor(AColor: TFPColor; procedure TLazCanvas.FillColor(AColor: TFPColor;
AIgnoreClippingAndWindowOrg: Boolean); AIgnoreClippingAndWindowOrg: Boolean);
@ -644,14 +645,12 @@ begin
end end
else else
begin begin
for y := 0 to Height-1 do for y := 0 to Height-1 do
for x := 0 to Width-1 do for x := 0 to Width-1 do
SetColor(x, y, AColor); SetColor(x, y, AColor);
end; end;
end; end;
{$endif}
procedure TLazCanvas.AssignPenData(APen: TFPCustomPen); procedure TLazCanvas.AssignPenData(APen: TFPCustomPen);
begin begin
if APen = nil then Exit; if APen = nil then Exit;