Skip to content

Commit 4e512a6

Browse files
committed
Sync FMX units with the Embarcadero fork.
1 parent b8c07b3 commit 4e512a6

File tree

3 files changed

+33
-3
lines changed

3 files changed

+33
-3
lines changed

Source/fmx/WrapDelphiFmx.pas

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ implementation
1111
WrapDelphiWindows,
1212
{$ENDIF MSWINDOWS}
1313
WrapDelphiDataBind,
14+
{$IFNDEF LINUX}
15+
WrapFmxDataBind,
16+
{$ENDIF LINUX}
1417
WrapFmxTypes,
1518
WrapFmxControls,
1619
WrapFmxStdCtrls,
@@ -30,7 +33,6 @@ implementation
3033
WrapFmxMenus,
3134
WrapFmxStyles,
3235
WrapFmxMemo,
33-
WrapFmxColors,
34-
WrapFmxDataBind;
36+
WrapFmxColors;
3537

3638
end.

Source/fmx/WrapFmxGrids.pas

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
interface
44

55
uses
6-
FMX.Grid, WrapFmxControls, WrapFmxScrollBox;
6+
FMX.Grid, FMX.Grid.Style, WrapFmxControls, WrapFmxScrollBox;
77

88
type
99
TPyDelphiColumn = class(TPyDelphiControl)

Source/fmx/WrapFmxTypes.pas

+28
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,16 @@ TPyDelphiControlSize = class(TPyDelphiPersistent)
148148
property DelphiObject: TControlSize read GetDelphiObject write SetDelphiObject;
149149
end;
150150

151+
TPyDelphiTimer = class (TPyDelphiComponent)
152+
private
153+
function GetDelphiObject: TTimer;
154+
procedure SetDelphiObject(const Value: TTimer);
155+
public
156+
class function DelphiObjectClass : TClass; override;
157+
// Properties
158+
property DelphiObject: TTimer read GetDelphiObject write SetDelphiObject;
159+
end;
160+
151161
{Helper functions}
152162
function WrapPointF(APyDelphiWrapper: TPyDelphiWrapper; const APoint : TPointF) : PPyObject;
153163
function WrapSizeF(APyDelphiWrapper: TPyDelphiWrapper; const ASize : TSizeF) : PPyObject;
@@ -289,6 +299,7 @@ procedure TTypesRegistration.RegisterWrappers(
289299
APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiCustomPopupMenu);
290300
APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiBounds);
291301
APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiControlSize);
302+
APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiTimer);
292303
end;
293304

294305
{ Helper functions }
@@ -905,6 +916,23 @@ function TPyDelphiRectF.Set_Top(AValue: PPyObject; AContext: Pointer): integer;
905916
Result := -1;
906917
end;
907918

919+
{ TPyDelphiTimer }
920+
921+
class function TPyDelphiTimer.DelphiObjectClass: TClass;
922+
begin
923+
Result := TTimer;
924+
end;
925+
926+
function TPyDelphiTimer.GetDelphiObject: TTimer;
927+
begin
928+
Result := TTimer(inherited DelphiObject);
929+
end;
930+
931+
procedure TPyDelphiTimer.SetDelphiObject(const Value: TTimer);
932+
begin
933+
inherited DelphiObject := Value;
934+
end;
935+
908936
initialization
909937
RegisteredUnits.Add(TTypesRegistration.Create);
910938
end.

0 commit comments

Comments
 (0)