From a1c9554bbf10f88cb0ca3602e3011d9977854ae5 Mon Sep 17 00:00:00 2001 From: Jorge Moraleda Date: Thu, 16 May 2024 16:14:54 -0400 Subject: [PATCH] Update wxWidgets to v3.2.5. Add support for new, MSW-only Accessibility related methods. --- etg/window.py | 17 +++++++++++++++++ etgtools/tweaker_tools.py | 1 + ext/wxWidgets | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/etg/window.py b/etg/window.py index c388df76..0c035f14 100644 --- a/etg/window.py +++ b/etg/window.py @@ -251,6 +251,23 @@ def run(): return NULL; #endif """) + c.find('GetOrCreateAccessible').setCppCode("""\ + #if wxUSE_ACCESSIBILITY + return self->GetOrCreateAccessible(); + #else + wxPyRaiseNotImplemented(); + return NULL; + #endif + """) + c.find('CreateAccessible').factory = True + c.find('CreateAccessible').setCppCode("""\ + #if wxUSE_ACCESSIBILITY + return self->CreateAccessible(); + #else + wxPyRaiseNotImplemented(); + return NULL; + #endif + """) c.find('SetAccessible.accessible').transfer = True c.find('SetAccessible').setCppCode("""\ #if wxUSE_ACCESSIBILITY diff --git a/etgtools/tweaker_tools.py b/etgtools/tweaker_tools.py index 1b63c717..960ffbe6 100644 --- a/etgtools/tweaker_tools.py +++ b/etgtools/tweaker_tools.py @@ -479,6 +479,7 @@ def addWindowVirtuals(klass): ('SetValidator', 'void SetValidator( const wxValidator &validator )'), ('GetValidator', 'wxValidator* GetValidator()'), ('EnableVisibleFocus', 'void EnableVisibleFocus(bool enabled)'), + ('CreateAccessible', 'wxAccessible* CreateAccessible()'), ## What about these? #bool HasMultiplePages() const diff --git a/ext/wxWidgets b/ext/wxWidgets index 085a136d..573e56d4 160000 --- a/ext/wxWidgets +++ b/ext/wxWidgets @@ -1 +1 @@ -Subproject commit 085a136dcb11aca5b1102193f006f8056d5f0876 +Subproject commit 573e56d432cc2c4b19a27aa5cad3e6045bfc542b