[GRASS-SVN] r33402 - in grass/trunk/gui/wxpython: gui_modules vdigit

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-09-11 03:09:10 -0400 (Thu, 11 Sep 2008)
New Revision: 33402

Modified:
   grass/trunk/gui/wxpython/gui_modules/dbm.py
   grass/trunk/gui/wxpython/vdigit/driver_draw.cpp
Log:
wxGUI/vdigit: fix area filling
(merge from devbr6, r33401)


Modified: grass/trunk/gui/wxpython/gui_modules/dbm.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/dbm.py	2008-09-11 07:07:56 UTC (rev 33401)
+++ grass/trunk/gui/wxpython/gui_modules/dbm.py	2008-09-11 07:09:10 UTC (rev 33402)
@@ -1057,7 +1057,7 @@
         cats = map(int, list.GetSelectedItems())
 
         digitToolbar = self.mapdisplay.toolbars['vdigit']
-        if digitToolbar and \
+        if digitToolbar and digitToolbar.GetLayer() and \
                 digitToolbar.GetLayer().GetName() == self.vectmap:
 
             self.mapdisplay.digit.driver.SetSelected(cats, cats=True)

Modified: grass/trunk/gui/wxpython/vdigit/driver_draw.cpp
===================================================================
--- grass/trunk/gui/wxpython/vdigit/driver_draw.cpp	2008-09-11 07:07:56 UTC (rev 33401)
+++ grass/trunk/gui/wxpython/vdigit/driver_draw.cpp	2008-09-11 07:09:10 UTC (rev 33402)
@@ -64,8 +64,7 @@
 
 	wxBrush *fillArea, *fillAreaSelected, *fillIsle;
 
-	// fillArea = new wxBrush(settings.area.color);
-	fillArea = new wxBrush(wxColour(100,100,100,0));
+	fillArea = new wxBrush(settings.area.color);
 	fillAreaSelected = new wxBrush(settings.highlight);
 	fillIsle = new wxBrush(*wxWHITE_BRUSH);