Merge pull request #2613 from jmoraleda/multiple-bug-fixes-in-pure-py…

…thon-aui Bugfixes in pure python aui where rapid layout changes may trigger calls to destroyed C++ objets.
wxWidgets · Sep 23, 2024 · be9e7d2 · be9e7d2 · Metallicow · Nov 17, 2024
2 parents b2733b5 + e4cb183
commit be9e7d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/wx/lib/agw/aui/auibook.py b/wx/lib/agw/aui/auibook.py
@@ -2457,7 +2457,8 @@ def GetPointedToTab(self):
 
         :rtype: :class:`wx.Window`.
         """
-
+        if not self:
+            return None # The AuiTabCtrl has already been destroyed
         screen_pt = wx.GetMousePosition()
         client_pt = self.ScreenToClient(screen_pt)
         return self.TabHitTest(client_pt.x, client_pt.y)

diff --git a/wx/lib/agw/aui/framemanager.py b/wx/lib/agw/aui/framemanager.py
@@ -8435,6 +8435,10 @@ def OnRender(self, event):
                                     not part.sizer_item.IsShown()):
                 continue
 
+            # don't draw items that have a pane whose window has been deleted
+            if part.pane and not part.pane.window:
+                continue
+
             ptype = part.type
 
             if ptype in [AuiDockUIPart.typeDockSizer, AuiDockUIPart.typePaneSizer]: