remove rest of TCL/TK artefacts

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

db/drivers/mysql/Makefile

@@ -14,7 +14,7 @@ include $(MODULE_TOPDIR)/include/Make/DB.make
 
 LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(DBSTUBSLIB) \
 	 $(GISLIB) $(DATETIMELIB) 
-EXTRA_CFLAGS = $(MYSQLINCPATH) $(TCLINCDIR) $(TKINCDIR)
+EXTRA_CFLAGS = $(MYSQLINCPATH)
 EXTRA_LDFLAGS = $(MYSQLLIBPATH)
 
 ifeq ($(PGM),mysql)

display/d.what.vect/Makefile

@@ -1,4 +1,3 @@
-
 MODULE_TOPDIR = ../..
 
 PGM = d.what.vect
@@ -12,12 +11,6 @@ EXTRA_INC = $(VECT_INC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-# substitute OSX arch flags for tcltk
-ifneq ($(MACOSX_ARCHS),)
-CFLAGS := $(subst $(MACOSX_ARCHS),,$(CFLAGS)) $(MACOSX_ARCHS_TCLTK)
-LDFLAGS := $(subst $(MACOSX_ARCHS),,$(LDFLAGS)) $(MACOSX_ARCHS_TCLTK)
-endif
-
 default: cmd
 
 

doc/debugging.txt

@@ -20,49 +20,6 @@ Further hints:
 '-Werror-implicit-function-declaration'
      Give a warning (or error) whenever a function is used before being
      declared.
-
-----------------------------------------------------
-Tcl/TK:
-
-A) Pure Tcl code:
-
-   Typically you need to add "trace" commands to the code
-   in question.
-
-B) To debug  TCL code which uses C (including hybrid C+Tcl 
-   code, e.g. NVIZ, v.digit, run (example):
-
-GRASS:~> g.gisenv set="DEBUG=1"
-GRASS:~> d.text.freetype > dtf_tcl.txt
-
-then edit 'dtf_tcl.txt'  to remove the "| wish &" from the end.
-
-then '. dtf_tcl.txt > dtf.tcl' to get rid of the echo-proofing chars.
-
-then 'wish < dtf.tcl'  to test it.
-
-References:
-"Is white space significant in Tcl"  http://wiki.tcl.tk/981
-"Tcl quoting hell"  http://wiki.tcl.tk/1726
-"1 minute intro to tcl"  http://www.pconline.com/~erc/tcl.htm
-
-NVIZ debug tip:
-   at the start of nviz2.2_script, change the DEBUG setting to:
-   set DEBUG 1
-
-To debug NVIZ:
-
-$ gdb $GISBASE/etc/nviz2.2/nviz
-> run -f $GISBASE/etc/nviz2.2/scripts/nviz2.2_script <any args>
-
-If you don't need to debug the startup, you can start NVIZ then
-"attach" to the process. E.g.
-
-$ gdb $GISBASE/etc/nviz2.2/nviz
-> attach <pid>
-> break Create_OS_Ctx
-> cont
-
 ----------------------------------------------------
 
 To make gcc less tolerant in accepting errors and code flaws, compile

gui/wxpython/docs/wxGUI.Nviz.html

@@ -382,8 +382,6 @@ tutorials</a>).
 Command-line module <em><a href="m.nviz.image.html">m.nviz.image</a></em>.
 <br><br>
 
-Original <a href="nviz.html">TCL/TK-based</a> Nviz.
-
 <h2>AUTHORS</h2>
 
 <a href="http://geo.fsv.cvut.cz/gwiki/Landa">Martin

gui/wxpython/lmgr/layertree.py

@@ -40,7 +40,7 @@ from wxplot.profile      import ProfileFrame
 from core.debug          import Debug
 from core.settings       import UserSettings, GetDisplayVectSettings
 from vdigit.main         import haveVDigit
-from core.gcmd           import GWarning
+from core.gcmd           import GWarning, GError
 from gui_core.toolbars   import BaseIcons
 from icons.icon          import MetaIcon
 
@@ -631,20 +631,11 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
         
         if not haveVDigit:
             from vdigit import errorMsg
-            msg = _("Unable to start wxGUI vector digitizer.\nDo you want to start "
-                    "TCL/TK digitizer (v.digit) instead?\n\n"
-                    "Details: %s" % errorMsg)
             
             self.mapdisplay.toolbars['map'].combo.SetValue (_("2D view"))
-            dlg = wx.MessageDialog(parent = self.mapdisplay,
-                                   message = msg,
-                                   caption=_("Vector digitizer failed"),
-                                   style = wx.YES_NO | wx.CENTRE)
-            if dlg.ShowModal() == wx.ID_YES:
-                self.lmgr.goutput.RunCmd(['v.digit', 'map=%s' % maplayer.GetName()],
-                                         switchPage = False)
             
-            dlg.Destroy()
+            GError(_("Unable to start wxGUI vector digitizer.\n"
+                     "Details: %s") % errorMsg, parent = self)
             return
         
         if not self.mapdisplay.GetToolbar('vdigit'): # enable tool

gui/wxpython/mapdisp/frame.py

@@ -194,22 +194,11 @@ class MapFrame(SingleMapFrame):
         
         if not haveVDigit:
             from vdigit import errorMsg
-            msg = _("Unable to start wxGUI vector digitizer.\nDo you want to start "
-                    "TCL/TK digitizer (v.digit) instead?\n\n"
-                    "Details: %s" % errorMsg)
             
             self.toolbars['map'].combo.SetValue(_("2D view"))
-            dlg = wx.MessageDialog(parent = self,
-                                   message = msg,
-                                   caption=_("Vector digitizer failed"),
-                                   style = wx.YES_NO | wx.CENTRE)
-            if dlg.ShowModal() == wx.ID_YES:
-                mapName = self.tree.GetPyData(self.tree.layer_selected)[0]['maplayer'].GetName()
-                self._layerManager.goutput.RunCmd(['v.digit', 'map=%s' % mapName],
-                                                  switchPage = False)
-            dlg.Destroy()
             
-            self.toolbars['map'].combo.SetValue(_("2D view"))
+            GError(_("Unable to start wxGUI vector digitizer.\n"
+                     "Details: %s") % errorMsg, parent = self)
             return
         
         if self._layerManager:

include/config.h.in

@@ -206,9 +206,6 @@
 /* define if NLS requested */
 #undef USE_NLS
 
-/* define if TclTk exists */
-#undef HAVE_TCLTK
-
 /* define if putenv() exists */
 #undef HAVE_PUTENV
 

mswindows/osgeo4w/config.h.vc

@@ -221,9 +221,6 @@
 /* define if <X11/GLw/GLwMDrawA.h> exists */
 /* #undef HAVE_X11_GLW_GLWMDRAWA_H */
 
-/* define if TclTk exists */
-#define HAVE_TCLTK 1
-
 /* define if putenv() exists */
 #ifndef HAVE_PUTENV
 #define HAVE_PUTENV 1

raster3d/r3.in.v5d/vis5d.h

@@ -54,10 +54,6 @@
 #define USAFILE "OUTLUSAM"
 
 
-/* Default filename of Tcl startup commands: */
-#define TCL_STARTUP_FILE "vis5d.tcl"
-
-
 /* Default directory to search for user functions: */
 #define FUNCTION_PATH "userfuncs"
 

raster3d/r3.out.v5d/vis5d.h

@@ -54,10 +54,6 @@
 #define USAFILE "OUTLUSAM"
 
 
-/* Default filename of Tcl startup commands: */
-#define TCL_STARTUP_FILE "vis5d.tcl"
-
-
 /* Default directory to search for user functions: */
 #define FUNCTION_PATH "userfuncs"