Fix pyscripter#312 Wrapper for Vcl Menu and Toolbar.

Author: pyscripter

Source/WrapActions.pas

@@ -126,7 +126,6 @@ function TActionListAccess.GetSize: Integer;
 
 function TActionListAccess.IndexOf(AValue: PPyObject): Integer;
 var
-  i: Integer;
   _obj: TPyObject;
   _item: TContainedAction;
 begin
@@ -140,12 +139,7 @@ function TActionListAccess.IndexOf(AValue: PPyObject): Integer;
         (TPyDelphiObject(_obj).DelphiObject is TContainedAction) then
       begin
         _item := TContainedAction(TPyDelphiObject(_obj).DelphiObject);
-        for i := 0 to Container.ActionCount - 1 do
-          if Container.Actions[i] = _item then
-          begin
-            Result := i;
-            Break;
-          end;
+        Result := _item.Index;
       end;
     end;
   end;

Source/WrapDelphi.pas

@@ -300,6 +300,9 @@
   - Wrapping of Records using extended RTTI
   - Wrapping of Interfaces using extended RTTI (see unit tests)
 
+    2021
+    - FMX Wrapping by Lucas Belo
+    - Vcl Menu and Toolbar wrapping by PyScripter
  TODO:
   - Extend SetProps: if property receiving the value is a TStrings and the value a sequence,
     then assign the sequence content to the TStrings.
@@ -308,7 +311,6 @@
   - Create a simple app that just initializes Python and executes a script? To avoid having a console...
   - Bug with Delphi pyd: can't change the application title, because TApplication creates its own handle
   - Wrap TApplicationEvents. In fact define the events used by TApplicationEvents.
-  - Wrap TMenu and Toolbar
   - Wrap TObjectList
   - Unit Test all exposed attributes
   - Wrap simple types like TMessage

Source/vcl/WrapVclComCtrls.pas

@@ -5,8 +5,15 @@
 interface
 
 uses
-  Classes, SysUtils, PythonEngine, WrapDelphi, WrapDelphiClasses,
-  WrapVclControls, Windows, ComCtrls, TypInfo;
+  Winapi.Windows,
+  System.SysUtils,
+  System.Classes,
+  System.TypInfo,
+  Vcl.ComCtrls,
+  PythonEngine,
+  WrapDelphi,
+  WrapDelphiClasses,
+  WrapVclControls;
 
 type
   TTabChangingEventHandler = class(TEventHandler)
@@ -113,10 +120,50 @@   TPyDelphiTrackBar = class (TPyDelphiWinControl)
     property DelphiObject: TTrackBar read GetDelphiObject write SetDelphiObject;
   end;
 
+  TPyDelphiToolButton = class(TPyDelphiGraphicControl)
+  private
+    function GetDelphiObject: TToolButton;
+    procedure SetDelphiObject(const Value: TToolButton);
+  public
+    class function DelphiObjectClass: TClass; override;
+    property DelphiObject: TToolButton read GetDelphiObject
+      write SetDelphiObject;
+  end;
+
+  TToolbarAccess = class(TContainerAccess)
+  private
+    function GetContainer: TToolbar;
+  public
+    function GetItem(AIndex: Integer): PPyObject; override;
+    function GetSize: Integer; override;
+    function IndexOf(AValue: PPyObject): Integer; override;
+    class function ExpectedContainerClass: TClass; override;
+    class function SupportsIndexOf: Boolean; override;
+    class function Name: string; override;
+    property Container: TToolbar read GetContainer;
+  end;
+
+  TPyDelphiToolbar = class(TPyDelphiWinControl)
+  private
+    function GetDelphiObject: TToolbar;
+    procedure SetDelphiObject(const Value: TToolbar);
+  protected
+    function Get_ButtonCount(AContext: Pointer): PPyObject; cdecl;
+    function Get_Buttons(AContext: Pointer): PPyObject; cdecl;
+  public
+    class function DelphiObjectClass: TClass; override;
+    class procedure RegisterGetSets(PythonType: TPythonType); override;
+    class function GetContainerAccessClass: TContainerAccessClass; override;
+
+    property DelphiObject: TToolbar read GetDelphiObject
+      write SetDelphiObject;
+  end;
+
 implementation
 
 uses
-  WrapDelphiTypes, ExtCtrls;
+  WrapDelphiTypes,
+  Vcl.ExtCtrls;
 
 { Register the wrappers, the globals and the constants }
 type
@@ -148,6 +195,8 @@ procedure TComCtrlsRegistration.RegisterWrappers(APyDelphiWrapper: TPyDelphiWrap
   APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiPageControl);
   APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiTabSheet);
   APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiTrackBar);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiToolButton);
+  APyDelphiWrapper.RegisterDelphiWrapper(TPyDelphiToolbar);
 
   APyDelphiWrapper.EventHandlers.RegisterHandler(TTabChangingEventHandler);
 end;
@@ -641,9 +690,128 @@ procedure TPyDelphiTrackBar.SetDelphiObject(const Value: TTrackBar);
   inherited DelphiObject := Value;
 end;
 
+{ TPyDelphiToolButton }
+
+class function TPyDelphiToolButton.DelphiObjectClass: TClass;
+begin
+  Result := TToolButton;
+end;
+
+function TPyDelphiToolButton.GetDelphiObject: TToolButton;
+begin
+  Result := TToolButton(inherited DelphiObject);
+end;
+
+procedure TPyDelphiToolButton.SetDelphiObject(const Value: TToolButton);
+begin
+  inherited DelphiObject := Value;
+end;
+
+{ TToolbarAccess }
+
+class function TToolbarAccess.ExpectedContainerClass: TClass;
+begin
+  Result := TToolbar;
+end;
+
+function TToolbarAccess.GetContainer: TToolbar;
+begin
+  Result := TToolbar(inherited Container);
+end;
+
+function TToolbarAccess.GetItem(AIndex: Integer): PPyObject;
+begin
+  Result := Wrap( Container.Buttons[AIndex] );
+end;
+
+function TToolbarAccess.GetSize: Integer;
+begin
+  Result := Container.ButtonCount;
+end;
+
+function TToolbarAccess.IndexOf(AValue: PPyObject): Integer;
+var
+  _obj: TPyObject;
+  _item: TToolButton;
+begin
+  Result := -1;
+  with GetPythonEngine do
+  begin
+    if IsDelphiObject(AValue) then
+    begin
+      _obj := PythonToDelphi(AValue);
+      if (_obj is TPyDelphiObject) and
+        (TPyDelphiObject(_obj).DelphiObject is TToolButton) then
+      begin
+        _item := TToolButton(TPyDelphiObject(_obj).DelphiObject);
+        Result := _item.Index;
+      end;
+    end;
+  end;
+end;
+
+class function TToolbarAccess.Name: string;
+begin
+  Result := 'Toolbar.Buttons'
+end;
+
+class function TToolbarAccess.SupportsIndexOf: Boolean;
+begin
+  Result := True;
+end;
+
+{ TPyDelphiToolbar }
+
+class function TPyDelphiToolbar.DelphiObjectClass: TClass;
+begin
+  Result := TToolbar;
+end;
+
+class function TPyDelphiToolbar.GetContainerAccessClass: TContainerAccessClass;
+begin
+  Result := TToolbarAccess;
+end;
+
+function TPyDelphiToolbar.GetDelphiObject: TToolbar;
+begin
+  Result := TToolbar(inherited DelphiObject);
+end;
+
+function TPyDelphiToolbar.Get_Buttons(AContext: Pointer): PPyObject;
+begin
+  Adjust(@Self);
+  Result := PyDelphiWrapper.DefaultContainerType.CreateInstance;
+  with PythonToDelphi(Result) as TPyDelphiContainer do
+    Setup(Self.PyDelphiWrapper, TToolbarAccess.Create(Self.PyDelphiWrapper,
+      Self.DelphiObject));
+end;
+
+function TPyDelphiToolbar.Get_ButtonCount(AContext: Pointer): PPyObject;
+begin
+  Adjust(@Self);
+  Result := GetPythonEngine.PyLong_FromLong(DelphiObject.ButtonCount);
+end;
+
+class procedure TPyDelphiToolbar.RegisterGetSets(PythonType: TPythonType);
+begin
+  inherited;
+  with PythonType do
+  begin
+    AddGetSet('ButtonCount', @TPyDelphiToolbar.Get_ButtonCount, nil,
+      'Indicates the number of buttons in the toolbar.', nil);
+    AddGetSet('Actions', @TPyDelphiToolbar.Get_Buttons, nil,
+      'Lists the buttons of the toolbar.', nil);
+  end;
+end;
+
+procedure TPyDelphiToolbar.SetDelphiObject(const Value: TToolbar);
+begin
+  inherited DelphiObject := Value;
+end;
+
 initialization
   RegisteredUnits.Add( TComCtrlsRegistration.Create );
   {$IFNDEF FPC}
-  Classes.RegisterClasses([TDateTimePicker]);
+  System.Classes.RegisterClasses([TDateTimePicker]);
   {$ENDIF FPC}
 end.

Source/vcl/WrapVclControls.pas

@@ -5,8 +5,14 @@
 interface
 
 uses
-  Classes, SysUtils, PythonEngine, WrapDelphi, WrapDelphiClasses, Controls,
-  TypInfo, Types;
+  System.Classes,
+  System.SysUtils,
+  System.TypInfo,
+  System.Types,
+  Vcl.Controls,
+  PythonEngine,
+  WrapDelphi,
+  WrapDelphiClasses;
 
 type
   {

Source/vcl/WrapVclMenus.pas

@@ -185,23 +185,23 @@ function TMenuItemAccess.GetSize: Integer;
 
 function TMenuItemAccess.IndexOf(AValue: PPyObject): Integer;
 var
-  _obj: TPyObject;
-  _item: TMenuItem;
-begin
-  Result := -1;
-  with GetPythonEngine do
-  begin
-    if IsDelphiObject(AValue) then
-    begin
-      _obj := PythonToDelphi(AValue);
-      if (_obj is TPyDelphiObject) and
-        (TPyDelphiObject(_obj).DelphiObject is TMenuItem) then
-      begin
-        _item := TMenuItem(TPyDelphiObject(_obj).DelphiObject);
-        Result := Container.IndexOf(_item);
-      end;
-    end;
-  end;
+  _obj: TPyObject;
+  _item: TMenuItem;
+begin
+  Result := -1;
+  with GetPythonEngine do
+  begin
+    if IsDelphiObject(AValue) then
+    begin
+      _obj := PythonToDelphi(AValue);
+      if (_obj is TPyDelphiObject) and
+        (TPyDelphiObject(_obj).DelphiObject is TMenuItem) then
+      begin
+        _item := TMenuItem(TPyDelphiObject(_obj).DelphiObject);
+        Result := Container.IndexOf(_item);
+      end;
+    end;
+  end;
 end;
 
 class function TMenuItemAccess.Name: string;