Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 01:30:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix InspectionTool crashes due to bad perspective string errros

Browse Source 
To ensure backward compatibility from version 4.2.3* to 4.2.2,
use the config key 'perspective1' for version 4.2.3 and later.

LoadPerspective => LoadPaneInfo raises an Exception, not a wx.PyAssertionError.
Therefore, change it to catch only Exception.
This commit is contained in:
Kazuya O'moto
2024-11-06 02:48:19 +09:00
parent 82b1c7aa7e
commit ba0e6b0e32
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wx/lib/agw/aui/framemanager.py
View File

@@ -5178,7 +5178,7 @@ class AuiManager(wx.EvtHandler):
elif val_name == "transparent": elif val_name == "transparent":
pane.transparent = int(value) pane.transparent = int(value)
else: else:
raise Exception("Bad perspective string") raise Exception("Bad perspective string", val_name)
# replace escaped characters so we can # replace escaped characters so we can
# split up the string easily # split up the string easily

6
wx/lib/inspection.py
View File

@@ -405,11 +405,11 @@ class InspectionFrame(wx.Frame):
rect = utils.AdjustRectToScreen(self.GetRect()) rect = utils.AdjustRectToScreen(self.GetRect())
self.SetRect(rect) self.SetRect(rect)
perspective = config.Read('perspective', '') perspective = config.Read('perspective1', '')
if perspective: if perspective:
try: try:
self.mgr.LoadPerspective(perspective) self.mgr.LoadPerspective(perspective)
except wx.PyAssertionError: except Exception:
# ignore bad perspective string errors # ignore bad perspective string errors
pass pass
self.includeSizers = config.ReadBool('includeSizers', False) self.includeSizers = config.ReadBool('includeSizers', False)
@@ -430,7 +430,7 @@ class InspectionFrame(wx.Frame):
if hasattr(self, "mgr"): if hasattr(self, "mgr"):
perspective = self.mgr.SavePerspective() perspective = self.mgr.SavePerspective()
config.Write('perspective', perspective) config.Write('perspective1', perspective)
config.WriteBool('includeSizers', self.includeSizers) config.WriteBool('includeSizers', self.includeSizers)
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------