[GRASS-SVN] r43280 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-08-26 08:59:03 +0000 (Thu, 26 Aug 2010)
New Revision: 43280

Modified:
   grass/trunk/gui/wxpython/gui_modules/mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
Log:
Split GLWindow.OnPaint() into OnPaint() and DoPaint()
 OnPaint() should only be called from an EVT_PAINT handler


Modified: grass/trunk/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2010-08-26 08:52:01 UTC (rev 43279)
+++ grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2010-08-26 08:59:03 UTC (rev 43280)
@@ -414,7 +414,7 @@
                 # add Nviz notebookpage
                 self._layerManager.AddNviz()
                 
-                self.MapWindow3D.OnPaint(None) # -> LoadData
+                self.MapWindow3D.DoPaint() # -> LoadData
                 self.MapWindow3D.Show()
                 self.MapWindow3D.UpdateView(None)
             else:

Modified: grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2010-08-26 08:52:01 UTC (rev 43279)
+++ grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2010-08-26 08:59:03 UTC (rev 43280)
@@ -161,6 +161,9 @@
         Debug.msg(1, "GLCanvas.OnPaint()")
         
         dc = wx.PaintDC(self)
+        self.DoPaint()
+
+    def DoPaint(self):
         self.SetCurrent()
         
         if not self.initView:
@@ -223,7 +226,7 @@
                                           self.view['twist']['value'])
                 
                 # redraw map
-                self.OnPaint(None)
+                self.DoPaint()
                 
                 # update statusbar
                 ### self.parent.StatusbarUpdate()