Skip to content

Commit b69a440

Browse files
committed
Include <wx/helpbase.h> instead of <wx/help.h> for wxHelpControllerBase
This hopefully resolves a link issue with GCC 16+ which performs more aggressive devirtualization. We want to avoid linking wxHTML into the core library, so we need to just include helpbase here so GCC doesn't see the derived classes. Fixes: #2807
1 parent bbc720e commit b69a440

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

etg/help.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ def run():
3939
c.find('GetFrameParameters.pos').out = True
4040
c.find('GetFrameParameters.newFrameEachTime').out = True
4141

42+
# We want to avoid having to link with wxHTML so override the include of
43+
# wx/help.h and use wx/helpbase.h instead. This is needed with GCC 16+
44+
# which performs more aggressive inlining.
45+
c.includes[c.includes.index('wx/help.h')] = 'wx/helpbase.h'
46+
4247

4348
# NOTE: Since wxHelpController is an alias for wxHtmlHelpController on
4449
# Mac and GTK, and since we don't want to force the wx.core extension

0 commit comments

Comments
 (0)