[GRASS-SVN] r65235 - grass/trunk/gui/wxpython/gui_core

svn_grass at osgeo.org svn_grass at osgeo.org
Thu May 14 06:00:38 PDT 2015


Author: martinl
Date: 2015-05-14 06:00:38 -0700 (Thu, 14 May 2015)
New Revision: 65235

Modified:
   grass/trunk/gui/wxpython/gui_core/mapdisp.py
Log:
wxGUI/MapFrame: define default values from name/title as empty string instead of None (avoid wx.Frame initialization failure)


Modified: grass/trunk/gui/wxpython/gui_core/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/mapdisp.py	2015-05-13 12:47:44 UTC (rev 65234)
+++ grass/trunk/gui/wxpython/gui_core/mapdisp.py	2015-05-14 13:00:38 UTC (rev 65235)
@@ -55,9 +55,9 @@
     
     AUI manager is stored in \c self._mgr.
     """
-    def __init__(self, parent = None, id = wx.ID_ANY, title = None,
+    def __init__(self, parent = None, id = wx.ID_ANY, title = '',
                  style = wx.DEFAULT_FRAME_STYLE,
-                 auimgr = None, name = None, **kwargs):
+                 auimgr = None, name = '', **kwargs):
         """
 
         .. warning::
@@ -394,10 +394,10 @@
     @note To access maps use getters only
     (when using class or when writing class itself).
     """
-    def __init__(self, parent = None, giface = None, id = wx.ID_ANY, title = None,
+    def __init__(self, parent = None, giface = None, id = wx.ID_ANY, title = '',
                  style = wx.DEFAULT_FRAME_STYLE,
                  Map = None,
-                 auimgr = None, name = None, **kwargs):
+                 auimgr = None, name = '', **kwargs):
         """
         
         :param parent: gui parent
@@ -418,7 +418,8 @@
         #
         # initialize region values
         #
-        self._initMap(Map = self.Map)
+        if self.Map:
+            self._initMap(Map = self.Map)
         
     def GetMap(self):
         """Returns map (renderer) instance"""



More information about the grass-commit mailing list