Fix pyscripter#478

Author: pyscripter

Source/vcl/WrapVclComCtrls.pas

@@ -731,7 +731,8 @@   TPyDelphiListView = class(TPyDelphiCustomListView)
 
   function CustomDrawTargetToPython(const ACustomDrawTarget: TCustomDrawTarget): PPyObject;
   function CustomDrawStageToPython(const ACustomDrawStage: TCustomDrawStage): PPyObject;
-  function CustomDrawStateToPython(const ACustomDrawState: TCustomDrawState): PPyObject;
+  function CustomDrawStateToPython(const ACustomDrawState: TCustomDrawState;
+    DelphiWrapper: TPyDelphiWrapper): PPyObject;
 
   function ItemChangeToPython(const AItemChange: TItemChange): PPyObject;
   function ItemStateToPython(const AItemState: TItemState): PPyObject;
@@ -742,8 +743,10 @@   TPyDelphiListView = class(TPyDelphiCustomListView)
 implementation
 
 uses
-  WrapDelphiTypes, WrapDelphiWindows,
-  Vcl.ExtCtrls;
+  System.Rtti,
+  Vcl.ExtCtrls,
+  WrapDelphiTypes,
+  WrapDelphiWindows;
 
 { Register the wrappers, the globals and the constants }
 type
@@ -780,31 +783,14 @@ function CustomDrawStageToPython(const ACustomDrawStage: TCustomDrawStage): PPyO
       Ord(ACustomDrawStage)));
 end;
 
-function CustomDrawStateToPython(const ACustomDrawState: TCustomDrawState): PPyObject;
-
-  procedure Append(const AList: PPyObject; const AString: string);
-  var
-    LItem: PPyObject;
-  begin
-    with GetPythonEngine do begin
-      LItem := PyUnicodeFromString(AString);
-      PyList_Append(AList, LItem);
-      Py_XDecRef(LItem);
-    end;
-  end;
-
+function CustomDrawStateToPython(const ACustomDrawState: TCustomDrawState;
+  DelphiWrapper: TPyDelphiWrapper): PPyObject;
 var
-  LCompType: PTypeInfo;
-  LMin: integer;
-  LMax: integer;
-  LState: integer;
+  ErrMsg: string;
+  Value: TValue;
 begin
-  Result := GetPythonEngine().PyList_New(0);
-  LCompType := GetTypeData(TypeInfo(TCustomDrawState)).CompType^;
-  LMin := LCompType^.TypeData^.MinValue;
-  LMax := LCompType^.TypeData^.MaxValue;
-  for LState := LMin to LMax do
-    Append(Result, GetEnumName(LCompType, LState));
+  Value := TValue.From(ACustomDrawState);
+  Result := TValueToPyObject(Value, DelphiWrapper, ErrMsg);
 end;
 
 function ItemChangeToPython(const AItemChange: TItemChange): PPyObject;
@@ -2203,7 +2189,7 @@ procedure TTVCustomDrawItemEventHandler.DoEvent(Sender: TCustomTreeView;
       LPyTuple := PyTuple_New(4);
       PyTuple_SetItem(LPyTuple, 0, LPyObject);
       PyTuple_SetItem(LPyTuple, 1, LPyNode);
-      PyTuple_SetItem(LPyTuple, 2, CustomDrawStateToPython(State));
+      PyTuple_SetItem(LPyTuple, 2, CustomDrawStateToPython(State, PyDelphiWrapper));
       PyTuple_SetItem(LPyTuple, 3, LPyDefaultDraw);
       try
         LPyResult := PyObject_CallObject(Callable, LPyTuple);
@@ -2306,7 +2292,7 @@ procedure TTVAdvancedCustomDrawItemEventHandler.DoEvent(Sender: TCustomTreeView;
       LPyTuple := PyTuple_New(6);
       PyTuple_SetItem(LPyTuple, 0, LPyObject);
       PyTuple_SetItem(LPyTuple, 1, LPyNode);
-      PyTuple_SetItem(LPyTuple, 2, CustomDrawStateToPython(State));
+      PyTuple_SetItem(LPyTuple, 2, CustomDrawStateToPython(State, PyDelphiWrapper));
       PyTuple_SetItem(LPyTuple, 3, CustomDrawStageToPython(Stage));
       PyTuple_SetItem(LPyTuple, 4, LPyPaintImages);
       PyTuple_SetItem(LPyTuple, 5, LPyDefaultDraw);
@@ -3098,7 +3084,7 @@ procedure TLVCustomDrawItemEventHandler.DoEvent(Sender: TCustomListView;
       LPyTuple := PyTuple_New(4);
       PyTuple_SetItem(LPyTuple, 0, LPyObject);
       PyTuple_SetItem(LPyTuple, 1, LPyItem);
-      PyTuple_SetItem(LPyTuple, 2, CustomDrawStateToPython(State));
+      PyTuple_SetItem(LPyTuple, 2, CustomDrawStateToPython(State, PyDelphiWrapper));
       PyTuple_SetItem(LPyTuple, 3, LPyDefaultDraw);
       try
         LPyResult := PyObject_CallObject(Callable, LPyTuple);
@@ -3150,7 +3136,7 @@ procedure TLVCustomDrawSubItemEventHandler.DoEvent(Sender: TCustomListView;
       PyTuple_SetItem(LPyTuple, 0, LPyObject);
       PyTuple_SetItem(LPyTuple, 1, LPyItem);
       PyTuple_SetItem(LPyTuple, 2, PyLong_FromLong(SubItem));
-      PyTuple_SetItem(LPyTuple, 3, CustomDrawStateToPython(State));
+      PyTuple_SetItem(LPyTuple, 3, CustomDrawStateToPython(State, PyDelphiWrapper));
       PyTuple_SetItem(LPyTuple, 4, LPyDefaultDraw);
       try
         LPyResult := PyObject_CallObject(Callable, LPyTuple);
@@ -3251,7 +3237,7 @@ procedure TLVAdvancedCustomDrawItemEventHandler.DoEvent(Sender: TCustomListView;
       LPyTuple := PyTuple_New(5);
       PyTuple_SetItem(LPyTuple, 0, LPyObject);
       PyTuple_SetItem(LPyTuple, 1, LPyItem);
-      PyTuple_SetItem(LPyTuple, 2, CustomDrawStateToPython(State));
+      PyTuple_SetItem(LPyTuple, 2, CustomDrawStateToPython(State, PyDelphiWrapper));
       PyTuple_SetItem(LPyTuple, 3, CustomDrawStageToPython(Stage));
       PyTuple_SetItem(LPyTuple, 4, LPyDefaultDraw);
       try
@@ -3304,7 +3290,7 @@ procedure TLVAdvancedCustomDrawSubItemEventHandler.DoEvent(
       PyTuple_SetItem(LPyTuple, 0, LPyObject);
       PyTuple_SetItem(LPyTuple, 1, LPyItem);
       PyTuple_SetItem(LPyTuple, 2, PyLong_FromLong(SubItem));
-      PyTuple_SetItem(LPyTuple, 3, CustomDrawStateToPython(State));
+      PyTuple_SetItem(LPyTuple, 3, CustomDrawStateToPython(State, PyDelphiWrapper));
       PyTuple_SetItem(LPyTuple, 4, CustomDrawStageToPython(Stage));
       PyTuple_SetItem(LPyTuple, 5, LPyDefaultDraw);
       try