Merged changes from feature branch dgp-privates-into-namespace,

	implementing TIP 44.  All Tk commands and variables matching
	tk[A-Z]* are now in the ::tk namespace.

2 files changed, 23 insertions, 11 deletions

diff --git a/unix/mkLinks b/unix/mkLinks
index 79155ea..9e9079d 100644
--- a/unix/mkLinks
+++ b/unix/mkLinks
@@ -28,10 +28,6 @@ if test "$x" != "xyzzyTestingAVeryLongFileName.foo"; then
     exit
 fi
 
-if test -r SetClassProcs.3; then
-    rm -f Tk_SetClassProcs.3
-    ln SetClassProcs.3 Tk_SetClassProcs.3
-fi
 if test -r 3DBorder.3; then
     rm -f Tk_Alloc3DBorderFromObj.3
     rm -f Tk_Get3DBorder.3
@@ -570,6 +566,10 @@ if test -r SetClass.3; then
     ln SetClass.3 Tk_SetClass.3
     ln SetClass.3 Tk_Class.3
 fi
+if test -r SetClassProcs.3; then
+    rm -f Tk_SetClassProcs.3
+    ln SetClassProcs.3 Tk_SetClassProcs.3
+fi
 if test -r SetGrid.3; then
     rm -f Tk_SetGrid.3
     rm -f Tk_UnsetGrid.3
@@ -706,6 +706,10 @@ if test -r getOpenFile.n; then
     ln getOpenFile.n tk_getOpenFile.n
     ln getOpenFile.n tk_getSaveFile.n
 fi
+if test -r menu.n; then
+    rm -f tk_menuSetFocus.n
+    ln menu.n tk_menuSetFocus.n
+fi
 if test -r menubar.n; then
     rm -f tk_menuBar.n
     rm -f tk_bindForTraversal.n
@@ -730,4 +734,12 @@ if test -r popup.n; then
     rm -f tk_popup.n
     ln popup.n tk_popup.n
 fi
+if test -r text.n; then
+    rm -f tk_textCopy.n
+    rm -f tk_textCut.n
+    rm -f tk_textPaste.n
+    ln text.n tk_textCopy.n
+    ln text.n tk_textCut.n
+    ln text.n tk_textPaste.n
+fi
 exit 0
diff --git a/unix/tkUnixDialog.c b/unix/tkUnixDialog.c
index 787fae6..9e31fd9 100644
--- a/unix/tkUnixDialog.c
+++ b/unix/tkUnixDialog.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUnixDialog.c,v 1.2 1998/09/14 18:23:55 stanton Exp $
+ * RCS: @(#) $Id: tkUnixDialog.c,v 1.3 2001/08/01 16:21:12 dgp Exp $
  *
  */
  
@@ -103,7 +103,7 @@ Tk_ChooseColorCmd(clientData, interp, argc, argv)
     int argc;			/* Number of arguments. */
     char **argv;		/* Argument strings. */
 {
-    return EvalArgv(interp, "tkColorDialog", argc, argv);
+    return EvalArgv(interp, "tk::ColorDialog", argc, argv);
 }
 
 /*
@@ -137,9 +137,9 @@ Tk_GetOpenFileCmd(clientData, interp, argc, argv)
     Tk_Window tkwin = (Tk_Window)clientData;
 
     if (Tk_StrictMotif(tkwin)) {
-	return EvalArgv(interp, "tkMotifFDialog", argc, argv);
+	return EvalArgv(interp, "tk::MotifFDialog", argc, argv);
     } else {
-	return EvalArgv(interp, "tkFDialog", argc, argv);
+	return EvalArgv(interp, "tk::FDialog", argc, argv);
     }
 }
 
@@ -170,9 +170,9 @@ Tk_GetSaveFileCmd(clientData, interp, argc, argv)
     Tk_Window tkwin = (Tk_Window)clientData;
 
     if (Tk_StrictMotif(tkwin)) {
-	return EvalArgv(interp, "tkMotifFDialog", argc, argv);
+	return EvalArgv(interp, "tk::MotifFDialog", argc, argv);
     } else {
-	return EvalArgv(interp, "tkFDialog", argc, argv);
+	return EvalArgv(interp, "tk::FDialog", argc, argv);
     }
 }
 
@@ -202,6 +202,6 @@ Tk_MessageBoxCmd(clientData, interp, argc, argv)
     int argc;			/* Number of arguments. */
     char **argv;		/* Argument strings. */
 {
-    return EvalArgv(interp, "tkMessageBox", argc, argv);
+    return EvalArgv(interp, "tk::MessageBox", argc, argv);
 }