[GRASS-SVN] r44598 - in grass/branches/releasebranch_6_4/gui/wxpython: gui_modules vdigit

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-12-13 08:04:21 -0800 (Mon, 13 Dec 2010)
New Revision: 44598

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py
   grass/branches/releasebranch_6_4/gui/wxpython/vdigit/Makefile
Log:
wxGUI: show error message when digitizer fails
(merge r44592 from devbr6)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py	2010-12-13 15:36:51 UTC (rev 44597)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py	2010-12-13 16:04:21 UTC (rev 44598)
@@ -1312,8 +1312,6 @@
                         message = str(e))
             return False
         
-        self.parent.digit.SetMapName(mapLayer.GetName())
-        
         # update toolbar
         self.combo.SetValue(mapLayer.GetName())
         self.parent.toolbars['map'].combo.SetValue (_('Digitize'))

Modified: grass/branches/releasebranch_6_4/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/vdigit/Makefile	2010-12-13 15:36:51 UTC (rev 44597)
+++ grass/branches/releasebranch_6_4/gui/wxpython/vdigit/Makefile	2010-12-13 16:04:21 UTC (rev 44598)
@@ -35,7 +35,7 @@
 
 $(SHLIB): $(LIB_NAME).i cats.cpp digit.cpp driver.cpp driver_draw.cpp \
 	driver_select.cpp line.cpp message.cpp select.cpp undo.cpp vertex.cpp
-	$(PYTHON) setup.py build_ext --swig=$(SWIG) --swig-opts=-c++ --build-lib=$(OBJDIR) --build-temp=$(OBJDIR)
+	$(PYTHON) setup.py build_ext --swig=swig --swig-opts=-c++ --build-lib=$(OBJDIR) --build-temp=$(OBJDIR)
 
 .NOTPARALLEL: $(LIB_NAME).py $(LIB_NAME)_wrap.cpp