Add mapped type for wxPGVariant and switch all wxVariant in propgrid to this type. This allows the variant types only available in propgrid to be used the same as the core variant types.

etg/_propgrid.py

@@ -23,7 +23,8 @@ ITEMS  = [ ]
 # The list of other ETG scripts and back-end generator modules that are
 # included as part of this module. These should all be items that are put in
 # the wxWidgets "propgrid" library in a multi-lib build.
-INCLUDES = [ 'propgriddefs',
+INCLUDES = [ 'pgvariant',
+             'propgriddefs',
              'propgridproperty',
              'propgrideditors',
              'propgridpagestate',

etg/propgrid.py

@@ -87,6 +87,13 @@ def run():
         """)
 
 
+    # Switch all wxVariant types to wxPGVariant, so the propgrid-specific
+    # version of the MappedType will be used for converting to/from Python
+    # objects.
+    for item in module.allItems():
+        if hasattr(item, 'type') and 'wxVariant' in item.type:
+            item.type = item.type.replace('wxVariant', 'wxPGVariant')
+
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
     tools.runGenerators(module)

etg/propgridadvprops.py

@@ -52,6 +52,13 @@ def run():
     m.find('value').default = 'wxArrayString()'
 
 
+    # Switch all wxVariant types to wxPGVariant, so the propgrid-specific
+    # version of the MappedType will be used for converting to/from Python
+    # objects.
+    for item in module.allItems():
+        if hasattr(item, 'type') and 'wxVariant' in item.type:
+            item.type = item.type.replace('wxVariant', 'wxPGVariant')
+
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
     tools.runGenerators(module)

etg/propgrideditors.py

@@ -45,6 +45,13 @@ def run():
     tools.fixWindowClass(c)
 
 
+    # Switch all wxVariant types to wxPGVariant, so the propgrid-specific
+    # version of the MappedType will be used for converting to/from Python
+    # objects.
+    for item in module.allItems():
+        if hasattr(item, 'type') and 'wxVariant' in item.type:
+            item.type = item.type.replace('wxVariant', 'wxPGVariant')
+
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
     tools.runGenerators(module)

etg/propgridiface.py

@@ -148,6 +148,14 @@ def run():
             item.type = 'const wxPGPropArgCls &'
 
 
+    # Switch all wxVariant types to wxPGVariant, so the propgrid-specific
+    # version of the MappedType will be used for converting to/from Python
+    # objects.
+    for item in module.allItems():
+        if hasattr(item, 'type') and 'wxVariant' in item.type:
+            item.type = item.type.replace('wxVariant', 'wxPGVariant')
+
+
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
     tools.runGenerators(module)

etg/propgridpagestate.py

@@ -52,6 +52,13 @@ def run():
     module.find('wxPG_IT_CHILDREN').ignore()
 
 
+    # Switch all wxVariant types to wxPGVariant, so the propgrid-specific
+    # version of the MappedType will be used for converting to/from Python
+    # objects.
+    for item in module.allItems():
+        if hasattr(item, 'type') and 'wxVariant' in item.type:
+            item.type = item.type.replace('wxVariant', 'wxPGVariant')
+
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
     tools.runGenerators(module)

etg/propgridproperty.py

@@ -162,6 +162,13 @@ def run():
             """)
 
 
+    # Switch all wxVariant types to wxPGVariant, so the propgrid-specific
+    # version of the MappedType will be used for converting to/from Python
+    # objects.
+    for item in module.allItems():
+        if hasattr(item, 'type') and 'wxVariant' in item.type:
+            item.type = item.type.replace('wxVariant', 'wxPGVariant')
+
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
     tools.runGenerators(module)

etg/propgridprops.py

@@ -91,6 +91,13 @@ def run():
     tools.fixWindowClass(c, hideVirtuals=False, ignoreProtected=False)
 
 
+    # Switch all wxVariant types to wxPGVariant, so the propgrid-specific
+    # version of the MappedType will be used for converting to/from Python
+    # objects.
+    for item in module.allItems():
+        if hasattr(item, 'type') and 'wxVariant' in item.type:
+            item.type = item.type.replace('wxVariant', 'wxPGVariant')
+
     #-----------------------------------------------------------------
     tools.doCommonTweaks(module)
     tools.runGenerators(module)