Browse Source

Split GLWindow.OnPaint() into OnPaint() and DoPaint()
OnPaint() should only be called from an EVT_PAINT handler


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@43280 15284696-431f-4ddb-bdfa-cd5b030d7da7

Glynn Clements 14 years ago
parent
commit
42e88b822b
2 changed files with 5 additions and 2 deletions
  1. 1 1
      gui/wxpython/gui_modules/mapdisp.py
  2. 4 1
      gui/wxpython/gui_modules/nviz_mapdisp.py

+ 1 - 1
gui/wxpython/gui_modules/mapdisp.py

@@ -414,7 +414,7 @@ class MapFrame(wx.Frame):
                 # add Nviz notebookpage
                 self._layerManager.AddNviz()
                 
-                self.MapWindow3D.OnPaint(None) # -> LoadData
+                self.MapWindow3D.DoPaint() # -> LoadData
                 self.MapWindow3D.Show()
                 self.MapWindow3D.UpdateView(None)
             else:

+ 4 - 1
gui/wxpython/gui_modules/nviz_mapdisp.py

@@ -161,6 +161,9 @@ class GLWindow(MapWindow, glcanvas.GLCanvas):
         Debug.msg(1, "GLCanvas.OnPaint()")
         
         dc = wx.PaintDC(self)
+        self.DoPaint()
+
+    def DoPaint(self):
         self.SetCurrent()
         
         if not self.initView:
@@ -223,7 +226,7 @@ class GLWindow(MapWindow, glcanvas.GLCanvas):
                                           self.view['twist']['value'])
                 
                 # redraw map
-                self.OnPaint(None)
+                self.DoPaint()
                 
                 # update statusbar
                 ### self.parent.StatusbarUpdate()