From ca3367a3403eebee6cd6fcf3e8c3eb670b9d628b Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 16 Sep 2020 16:38:45 -0700
Subject: [PATCH] Enable GridActivationResult and GridActivationSource

---
 docs/sphinx/itemToModuleMap.json | 4 +++-
 etg/grid.py                      | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/sphinx/itemToModuleMap.json b/docs/sphinx/itemToModuleMap.json
index e0d21a7d..53c5eaba 100644
--- a/docs/sphinx/itemToModuleMap.json
+++ b/docs/sphinx/itemToModuleMap.json
@@ -1435,6 +1435,8 @@
 "GraphicsPenInfo":"wx.",
 "GraphicsRenderer":"wx.",
 "Grid":"wx.grid.",
+"GridActivationResult":"wx.grid.",
+"GridActivationSource":"wx.grid.",
 "GridBagSizer":"wx.",
 "GridBlockCoords":"wx.grid.",
 "GridBlockDiffResult":"wx.grid.",
@@ -2609,7 +2611,7 @@
 "ObjectRefData":"wx.",
 "OperatingSystemId":"wx.",
 "Orientation":"wx.",
-"Origin":"wx.HelpEvent.",
+"Origin":"wx.grid.GridActivationSource.",
 "OutBottom":"wx.",
 "OutCode":"wx.",
 "OutLeft":"wx.",
diff --git a/etg/grid.py b/etg/grid.py
index c9a3fe32..cbb7d527 100644
--- a/etg/grid.py
+++ b/etg/grid.py
@@ -284,7 +284,6 @@ def run():
     #-----------------------------------------------------------------
 
     c = module.find('wxGridActivationResult')
-    c.ignore() # FIXME: Remove this after switching to sip 4.19.24
     c.addPrivateAssignOp()
     c.addPrivateDefaultCtor()
     c.instanceCode = """\
@@ -294,7 +293,6 @@ def run():
 
 
     c = module.find('wxGridActivationSource')
-    c.ignore() # FIXME: Remove this after switching to sip 4.19.24
     c.noDefCtor = True
     c.addPrivateAssignOp()
 
@@ -395,11 +393,9 @@ def run():
     c.find('~wxGridCellEditor').ignore(False)
     c.find('Clone').factory = True
     tools.fixRefCountedClass(c)
-    c.find('TryActivate').ignore() # FIXME: Remove this after switching to sip 4.19.24
 
 
     c = module.find('wxGridCellActivatableEditor')
-    c.ignore() # FIXME: Remove this after switching to sip 4.19.24
 
 
     c = module.find('wxGridCellChoiceEditor')