Parcourir la source

wxNviz: attempt to fix crash on Windows when closing gui

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@53246 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová il y a 12 ans
Parent
commit
3e3815ad4c
2 fichiers modifiés avec 5 ajouts et 8 suppressions
  1. 1 2
      gui/wxpython/lmgr/frame.py
  2. 4 6
      gui/wxpython/nviz/tools.py

+ 1 - 2
gui/wxpython/lmgr/frame.py

@@ -305,8 +305,7 @@ class GMFrame(wx.Frame):
         """!Remove nviz notebook page"""
         # if more mapwindow3D were possible, check here if nb page should be removed
         self.notebook.SetSelectionByName('layers')
-        self.notebook.RemovePage('nviz')
-        del self.nviz
+        self.notebook.DeletePage('nviz')
 
         # hide toolbar
         self._auimgr.GetPane('toolbarNviz').Hide()

+ 4 - 6
gui/wxpython/nviz/tools.py

@@ -537,10 +537,10 @@ class NvizToolWindow(FN.FlatNotebook):
 
 
         
-        # surface page
-        self.surfacePanel = self.foldpanelData.AddFoldPanel(_("Surface"), collapsed = False)
-        self.foldpanelData.AddFoldPanelWindow(self.surfacePanel, 
-            window = self._createSurfacePage(parent = self.surfacePanel), flags = fpb.FPB_ALIGN_WIDTH)
+        # # surface page
+        surfacePanel = self.foldpanelData.AddFoldPanel(_("Surface"), collapsed = False)
+        self.foldpanelData.AddFoldPanelWindow(surfacePanel, 
+            window = self._createSurfacePage(parent = surfacePanel), flags = fpb.FPB_ALIGN_WIDTH)
         self.EnablePage("surface", enabled = False)
         
         # constant page
@@ -885,8 +885,6 @@ class NvizToolWindow(FN.FlatNotebook):
         
         boxSizer.Add(item = gridSizer, proportion = 1,
                   flag = wx.ALL | wx.EXPAND, border = 3)
-        box.SetSizer(boxSizer)
-        box.Layout()
         
         pageSizer.Add(item = boxSizer, proportion = 1,
                       flag = wx.EXPAND | wx.LEFT | wx.RIGHT | wx.BOTTOM,