From Mo DeJong <supermo@bayarea.net>

        * generic/tkText.c (ExecSyncCmd):
        Remove -synccommand option from Tk text widget.
        This local modification was used by an very old
        version of Source-Navigator, but is no longer
        needed. Remove ExecSyncCmd function.
        * generic/tkText.h (TkText): Remove SyncCmd member.
        * library/msgbox.tcl (tkMessageBox): Remove unused
        -modal option. This was a local mod to tk.
        * tests/text.test: Add default value for -tabsize.
        This is a local mod to tk.
        * tests/wm.test: Fixup iconwindow error messages.

diff --git a/tk/ChangeLog b/tk/ChangeLog
index 25be205..5d1be6d 100644 (file)
--- a/tk/ChangeLog
+++ b/tk/ChangeLog
@@ -1,3 +1,18 @@
+2002-07-31  Keith Seitz  <keiths@redhat.com>
+
+       From Mo DeJong  <supermo@bayarea.net>
+       * generic/tkText.c (ExecSyncCmd):
+       Remove -synccommand option from Tk text widget.
+       This local modification was used by an very old
+       version of Source-Navigator, but is no longer
+       needed. Remove ExecSyncCmd function.
+       * generic/tkText.h (TkText): Remove SyncCmd member.
+       * library/msgbox.tcl (tkMessageBox): Remove unused
+       -modal option. This was a local mod to tk.
+       * tests/text.test: Add default value for -tabsize.
+       This is a local mod to tk.
+       * tests/wm.test: Fixup iconwindow error messages.
+
 2002-01-24  DJ Delorie  <dj@redhat.com>
 
        * xlib/X11/Xutil.h (XEmptyRegion): Returns Bool.

diff --git a/tk/generic/tkText.c b/tk/generic/tkText.c
index 560c026..fe9c6b6 100644 (file)
--- a/tk/generic/tkText.c
+++ b/tk/generic/tkText.c
@@ -139,15 +139,10 @@ static Tk_ConfigSpec configSpecs[] = {
     {TK_CONFIG_STRING, "-yscrollcommand", "yScrollCommand", "ScrollCommand",
        DEF_TEXT_YSCROLL_COMMAND, Tk_Offset(TkText, yScrollCmd),
        TK_CONFIG_NULL_OK},
-       
-    {TK_CONFIG_STRING, "-synccommand", "syncCommand", "SyncCommand",
-       DEF_TEXT_YSCROLL_COMMAND, Tk_Offset(TkText, SyncCmd),
-       TK_CONFIG_NULL_OK},
-       
-       
+    /* Red Hat Local */
     {TK_CONFIG_INT, "-tabsize", "tabSize", "TabSize",
        DEF_TEXT_TAB_SIZE, Tk_Offset(TkText, tabsize), 0},
-       
+    /* End Red Hat Local */
     {TK_CONFIG_END, (char *) NULL, (char *) NULL, (char *) NULL,
        (char *) NULL, 0, 0}
 };
@@ -438,7 +433,6 @@ Tk_TextCmd(clientData, interp, argc, argv)
     
     /*
      * KHAMIS */
-    textPtr->SyncCmd = NULL;
     textPtr->flags = 0;
 
     /*
@@ -472,54 +466,6 @@ Tk_TextCmd(clientData, interp, argc, argv)
 
     return TCL_OK;
 }
-\f
-/*
- *--------------------------------------------------------------
- *
- * TextWidgetCmd --
- *
- *     This procedure is invoked to process the Tcl command
- *     that corresponds to a text widget.  See the user
- *     documentation for details on what it does.
- *
- * Results:
- *     A standard Tcl result.
- *
- * Side effects:
- *     See the user documentation.
- *
- *--------------------------------------------------------------
- */
-static int 
-ExecSyncCmd (interp, textPtr, argc, argv)
-     Tcl_Interp *interp;
-     TkText *textPtr;
-     int argc;
-     char *argv[];
-{
-    static int ExecSyncCmdActive=0;
-    int i, ret;
-    Tcl_DString cmd;
-    
-    if (ExecSyncCmdActive)
-    {
-       return TCL_OK;
-    }
-    ExecSyncCmdActive = 1;
-    
-    Tcl_DStringInit (&cmd);
-    Tcl_DStringAppend (&cmd, textPtr->SyncCmd, -1);
-    for (i=1;i<argc;i++) {
-       Tcl_DStringAppendElement (&cmd, argv[i]);
-    }
-
-    ret = Tcl_Eval (interp, Tcl_DStringValue(&cmd));
-    Tcl_DStringFree (&cmd);
-    
-    ExecSyncCmdActive = 0;
-    
-    return ret;
-}
 
 static void
 ViewArgs (reason, argc, argv, mode)

diff --git a/tk/generic/tkText.h b/tk/generic/tkText.h
index 9152e2c..b3af54e 100644 (file)
--- a/tk/generic/tkText.h
+++ b/tk/generic/tkText.h
@@ -628,10 +628,6 @@ typedef struct TkText {
                                 * horizontal scrollbar when view changes. */
     char *yScrollCmd;          /* Prefix of command to issue to update
                                 * vertical scrollbar when view changes. */
-    /* KHAMIS */
-    char *SyncCmd;             /* Used to synchronize more than editor with the
-                                * same file*/
-                                
     int flags;                 /* Miscellaneous flags;  see below for
                                 * definitions. */
 } TkText;

diff --git a/tk/library/msgbox.tcl b/tk/library/msgbox.tcl
index 1e6744f..002f6e4 100644 (file)
--- a/tk/library/msgbox.tcl
+++ b/tk/library/msgbox.tcl
@@ -146,7 +146,6 @@ proc tkMessageBox {args} {
        {-default "" "" ""}
         {-icon "" "" "info"}
         {-message "" "" ""}
-        {-modal "" "" ""}
         {-parent "" "" .}
         {-title "" "" " "}
         {-type "" "" "ok"}

diff --git a/tk/tests/text.test b/tk/tests/text.test
index e002c7e..c512207 100644 (file)
--- a/tk/tests/text.test
+++ b/tk/tests/text.test
@@ -111,7 +111,7 @@ test text-1.[incr i] {text options} {
        lappend result [lindex $i 4]
     }
     set result
-} {blue {} {} 7 watch 0 {} fixed #012 5 #123 #234 0 green 45 100 47 2 3 82 raised #ffff01234567 21 yellow 0 0 0 0 disabled {1i 2i 3i 4i} {any old thing} 73 word {x scroll command} {test command}}
+} {blue {} {} 7 watch 0 {} fixed #012 5 #123 #234 0 green 45 100 47 2 3 82 raised #ffff01234567 21 yellow 0 0 0 0 disabled {1i 2i 3i 4i} {any old thing} 73 word {x scroll command} {test command} 8}
 
 test text-2.1 {Tk_TextCmd procedure} {
     list [catch {text} msg] $msg

diff --git a/tk/tests/wm.test b/tk/tests/wm.test
index e696354..c6e02bd 100644 (file)
--- a/tk/tests/wm.test
+++ b/tk/tests/wm.test
@@ -275,7 +275,7 @@ test wm-10.1 {icon windows} {
     toplevel .icon -width 50 -height 50 -bg red
     wm iconwindow .t .icon
     list [catch {wm iconify .icon} msg] $msg
-} {1 {can't iconify .icon: it is an icon for .icon}}
+} {1 {can't iconify .icon: it is an icon for .t}}
 test wm-10.2 {icon windows} {
     catch {destroy .t}
     catch {destroy .icon}
@@ -284,7 +284,7 @@ test wm-10.2 {icon windows} {
     toplevel .icon -width 50 -height 50 -bg red
     wm iconwindow .t .icon
     list [catch {wm deiconify .icon} msg] $msg
-} {1 {can't deiconify .icon: it is an icon for .icon}}
+} {1 {can't deiconify .icon: it is an icon for .t}}
 test wm-10.3 {icon windows} {
     catch {destroy .t}
     catch {destroy .icon}