Merge pull request #2874 from swt2c/accessibility_wip

swt2c · web-flow · commit 1a5e2cf2756f · 2026-04-01T14:41:54.000-04:00
Support CreateAccessible in all wxWindow subclasses
diff --git a/etg/_adv.py b/etg/_adv.py
@@ -79,6 +79,7 @@ def run():
 
     module.addHeaderCode('#include <wxPython/wxpy_api.h>')
     module.addHeaderCode('#include <wx/help.h>')
+    tools.addAccessibilityHeaderCode(module)
 
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
diff --git a/etg/_aui.py b/etg/_aui.py
@@ -60,6 +60,7 @@ def run():
     # customizing the generated code and docstrings.
 
     module.addHeaderCode('#include <wxPython/wxpy_api.h>')
+    tools.addAccessibilityHeaderCode(module)
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
 
diff --git a/etg/_dataview.py b/etg/_dataview.py
@@ -59,6 +59,7 @@ def run():
     # customizing the generated code and docstrings.
 
     module.addHeaderCode('#include <wxPython/wxpy_api.h>')
+    tools.addAccessibilityHeaderCode(module)
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
 
diff --git a/etg/_glcanvas.py b/etg/_glcanvas.py
@@ -54,6 +54,7 @@ def run():
     # customizing the generated code and docstrings.
 
     module.addHeaderCode('#include <wxPython/wxpy_api.h>')
+    tools.addAccessibilityHeaderCode(module)
     module.addImport('_core')
     module.addPyCode('import wx', order=10)
     module.addInclude(INCLUDES)
diff --git a/etg/_grid.py b/etg/_grid.py
@@ -55,6 +55,7 @@ def run():
     # customizing the generated code and docstrings.
 
     module.addHeaderCode('#include <wxPython/wxpy_api.h>')
+    tools.addAccessibilityHeaderCode(module)
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
 
diff --git a/etg/_html.py b/etg/_html.py
@@ -74,6 +74,7 @@ def run():
     # customizing the generated code and docstrings.
 
     module.addHeaderCode('#include <wxPython/wxpy_api.h>')
+    tools.addAccessibilityHeaderCode(module)
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
     module.addInclude(INCLUDES)
diff --git a/etg/_html2.py b/etg/_html2.py
@@ -56,6 +56,7 @@ def run():
     # customizing the generated code and docstrings.
 
     module.addHeaderCode('#include <wxPython/wxpy_api.h>')
+    tools.addAccessibilityHeaderCode(module)
     module.addImport('_core')
     module.addPyCode('import wx', order=10)
     module.addInclude(INCLUDES)
diff --git a/etg/_propgrid.py b/etg/_propgrid.py
@@ -57,6 +57,7 @@ def run():
     # customizing the generated code and docstrings.
 
     module.addHeaderCode('#include <wxPython/wxpy_api.h>')
+    tools.addAccessibilityHeaderCode(module)
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
 
diff --git a/etg/_ribbon.py b/etg/_ribbon.py
@@ -60,6 +60,7 @@ def run():
     # customizing the generated code and docstrings.
 
     module.addHeaderCode('#include <wxPython/wxpy_api.h>')
+    tools.addAccessibilityHeaderCode(module)
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
 
diff --git a/etg/_richtext.py b/etg/_richtext.py
@@ -65,6 +65,7 @@ def run():
     # customizing the generated code and docstrings.
 
     module.addHeaderCode('#include <wxPython/wxpy_api.h>')
+    tools.addAccessibilityHeaderCode(module)
     module.addImport('_core')
     module.addPyCode("import wx", order=10)
     module.addImport('_xml')
diff --git a/etg/_stc.py b/etg/_stc.py
@@ -53,6 +53,7 @@ def run():
     # customizing the generated code and docstrings.
 
     module.addHeaderCode('#include <wxPython/wxpy_api.h>')
+    tools.addAccessibilityHeaderCode(module)
     module.addImport('_core')
     module.addPyCode('''\
     import wx
diff --git a/etg/scrolwin.py b/etg/scrolwin.py
@@ -70,6 +70,10 @@ def parseAndTweakModule():
     scrolled.find('ShouldScrollToChildOnFocus').ignore(False)
     scrolled.find('ShouldScrollToChildOnFocus').isVirtual = True
 
+    # Workaround a bug in sip by renaming template args for wxScrolled
+    scrolled.templateParams = ['BASE']
+    scrolled.bases = ['BASE']
+
     # The wxScrolledCanvas typedef will be output normally and SIP will treat
     # it like a class that has a wxScrolled mix-in as one of the base classes.
     # Let's add some more info to them for the doc generators.
diff --git a/etgtools/tweaker_tools.py b/etgtools/tweaker_tools.py
@@ -23,8 +23,6 @@
 from typing import NamedTuple, Optional, Tuple, Union
 
 
-isWindows = sys.platform.startswith('win')
-
 magicMethods = {
     'operator!='    : '__ne__',
     'operator=='    : '__eq__',
@@ -771,9 +769,6 @@ def addWindowVirtuals(klass):
         #void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
         #void DoUpdateWindowUI(wxUpdateUIEvent& event) ;
     ]
-    if isWindows:
-        # does not compile on GTK and macOS.
-        publicWindowVirtuals.append( ('CreateAccessible', 'wxAccessible* CreateAccessible()') )
 
     protectedWindowVirtuals = [
         ('ProcessEvent',              'bool ProcessEvent(wxEvent & event)'),
@@ -820,6 +815,16 @@ def _processItems(klass, prot, virtuals):
     klass.addItem(extractors.WigCode(txt))
     klass.addPublic()
 
+    if klass.name not in ['wxWindow', 'wxProgressDialog', 'wxRichTextCtrl']:
+        klass.addCppMethod('wxAccessible*', 'CreateAccessible', '()', """\
+            #if wxUSE_ACCESSIBILITY
+                return self->CreateAccessible();
+            #else
+                wxPyRaiseNotImplemented();
+                return NULL;
+            #endif
+            """, factory=True)
+
 
 def addSipConvertToSubClassCode(klass):
     """
@@ -1037,6 +1042,18 @@ def addGetIMMethodTemplate(module, klass, fields):
 
 #---------------------------------------------------------------------------
 
+
+def addAccessibilityHeaderCode(module):
+    # This is needed in any module that has wxWindow subclasses so that the
+    # CreateAccessible methods can be compiled correctly.
+    module.addHeaderCode('#include <wx/access.h>')
+    module.addHeaderCode([
+        '#if !wxUSE_ACCESSIBILITY',
+        'class wxAccessible;',
+        '#endif',
+    ])
+
+
 def convertTwoIntegersTemplate(CLASS):
     # Note: The GIL is already acquired where this code is used.
     return AutoConversionInfo(
