From bd6733afa2e20ba59e8a162652be2d1637248ae5 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 8 Jul 2020 16:51:27 -0700
Subject: [PATCH] Add, and ignore for now, some new things in grid

---
 etg/grid.py | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/etg/grid.py b/etg/grid.py
index 1a9bd76e..ecf6e759 100644
--- a/etg/grid.py
+++ b/etg/grid.py
@@ -33,7 +33,11 @@ ITEMS  = [ 'wxGridCellCoords',
            'wxGridCellFloatRenderer',
            'wxGridCellNumberRenderer',
 
+           'wxGridActivationResult',
+           'wxGridActivationSource',
+
            'wxGridCellEditor',
+           'wxGridCellActivatableEditor',
            'wxGridCellTextEditor',
            'wxGridCellDateEditor',
            'wxGridCellAutoWrapStringEditor',
@@ -277,6 +281,20 @@ def run():
     module.addPyCode("PyGridCellRenderer = wx.deprecated(GridCellRenderer, 'Use GridCellRenderer instead.')")
 
 
+    #-----------------------------------------------------------------
+
+    c = module.find('wxGridActivationResult')
+    c.ignore() # FIXME
+    c.addPrivateAssignOp()
+    c.instanceCode = 'sipCpp = new wxGridActivationResult::DoNothing();'
+
+
+    c = module.find('wxGridActivationSource')
+    c.ignore() # FIXME
+    c.noDefCtor = True
+    c.addPrivateAssignOp()
+
+
     #-----------------------------------------------------------------
     def fixEditorClass(name):
         klass = module.find(name)
@@ -373,14 +391,18 @@ def run():
     c.find('~wxGridCellEditor').ignore(False)
     c.find('Clone').factory = True
     tools.fixRefCountedClass(c)
-    c.find('TryActivate').ignore() # FIXME: remove this when the compilations issues with wxGridActivationResult is fixed
+    c.find('TryActivate').ignore() # FIXME: remove this when the compilation issues with wxGridActivationResult is fixed
+
+
+    c = module.find('wxGridCellActivatableEditor')
+    c.ignore() # FIXME: see above
 
 
     c = module.find('wxGridCellChoiceEditor')
     c.find('wxGridCellChoiceEditor').findOverload('count').ignore()
 
     for name in ITEMS:
-        if 'Cell' in name and 'Editor' in name:
+        if 'Cell' in name and 'Editor' in name and name != 'wxGridCellActivatableEditor':
             fixEditorClass(name)
 
     module.addPyCode("PyGridCellEditor = wx.deprecated(GridCellEditor, 'Use GridCellEditor instead.')")