X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de824c0c9cec70a6369d011fb635c8ba12bdacea..75d9e502238df95fa53c0030b1fac0d4f43e4025:/wxPython/demo/AUI_DockingWindowMgr.py diff --git a/wxPython/demo/AUI_DockingWindowMgr.py b/wxPython/demo/AUI_DockingWindowMgr.py index 2bf81662c9..eaa912928c 100644 --- a/wxPython/demo/AUI_DockingWindowMgr.py +++ b/wxPython/demo/AUI_DockingWindowMgr.py @@ -395,7 +395,7 @@ class PyAUIFrame(wx.Frame): self.Bind(wx.EVT_MENU, self.OnChangeContentPane, id=ID_TextContent) self.Bind(wx.EVT_MENU, self.OnChangeContentPane, id=ID_SizeReportContent) self.Bind(wx.EVT_MENU, self.OnChangeContentPane, id=ID_HTMLContent) - self.Bind(wx.EVT_MENU, self.OnClose, id=wx.ID_EXIT) + self.Bind(wx.EVT_MENU, self.OnExit, id=wx.ID_EXIT) self.Bind(wx.EVT_MENU, self.OnAbout, id=ID_About) self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=ID_TransparentHint) @@ -431,12 +431,13 @@ class PyAUIFrame(wx.Frame): def OnClose(self, event): - self._mgr.UnInit() + del self._mgr self.Destroy() - event.Skip() + def OnExit(self, event): + self.Close() def OnAbout(self, event): @@ -491,7 +492,7 @@ class PyAUIFrame(wx.Frame): elif event.GetId() == ID_HorizontalGradient: gradient = wx.aui.AUI_GRADIENT_HORIZONTAL - self._mgr.GetArtProvider().SetMetric(wx.aui.AUI_ART_GRADIENT_TYPE, gradient) + self._mgr.GetArtProvider().SetMetric(wx.aui.AUI_DOCKART_GRADIENT_TYPE, gradient) self._mgr.Update() @@ -533,13 +534,13 @@ class PyAUIFrame(wx.Frame): eid = event.GetId() if eid == ID_NoGradient: - event.Check(self._mgr.GetArtProvider().GetMetric(wx.aui.AUI_ART_GRADIENT_TYPE) == wx.aui.AUI_GRADIENT_NONE) + event.Check(self._mgr.GetArtProvider().GetMetric(wx.aui.AUI_DOCKART_GRADIENT_TYPE) == wx.aui.AUI_GRADIENT_NONE) elif eid == ID_VerticalGradient: - event.Check(self._mgr.GetArtProvider().GetMetric(wx.aui.AUI_ART_GRADIENT_TYPE) == wx.aui.AUI_GRADIENT_VERTICAL) + event.Check(self._mgr.GetArtProvider().GetMetric(wx.aui.AUI_DOCKART_GRADIENT_TYPE) == wx.aui.AUI_GRADIENT_VERTICAL) elif eid == ID_HorizontalGradient: - event.Check(self._mgr.GetArtProvider().GetMetric(wx.aui.AUI_ART_GRADIENT_TYPE) == wx.aui.AUI_GRADIENT_HORIZONTAL) + event.Check(self._mgr.GetArtProvider().GetMetric(wx.aui.AUI_DOCKART_GRADIENT_TYPE) == wx.aui.AUI_GRADIENT_HORIZONTAL) elif eid == ID_AllowFloating: event.Check((flags & wx.aui.AUI_MGR_ALLOW_FLOATING) != 0)